From 6f712c059645979f7cb27d740ef921558beb6abc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Sachse?= <Joerg.Sachse@slub-dresden.de>
Date: Tue, 23 Mar 2021 08:48:24 +0100
Subject: [PATCH] chore: remove individual tags from tags, as we use tag
inheritance now
---
tasks/configure-apache.yml | 7 -------
tasks/configure-crontab.yml | 1 -
tasks/configure-iptables.yml | 1 -
tasks/configure-nfs-mounts.yml | 3 +--
tasks/configure_local_mounts.yml | 1 -
tasks/create-users-groups.yml | 2 --
tasks/install-callas-pdf-engine.yml | 13 -------------
tasks/install-converters.yml | 1 -
tasks/install-packages.yml | 3 ---
tasks/install-validators.yml | 1 -
10 files changed, 1 insertion(+), 32 deletions(-)
diff --git a/tasks/configure-apache.yml b/tasks/configure-apache.yml
index e9b7609..897311f 100644
--- a/tasks/configure-apache.yml
+++ b/tasks/configure-apache.yml
@@ -11,7 +11,6 @@
dest: "/etc/logrotate.d/"
notify:
- restart apache
- tags: [apache]
- name: Konfigurationsdateien einspielen (templated)
template:
@@ -22,7 +21,6 @@
dest: "/etc/apache2/sites-available/000-default.conf"
notify:
- restart apache
- tags: [apache]
# symlink /etc/apache2/mods-available/cgi.load to /etc/apache2/mods-enabled/
- name: CGI-Extension-Modul aktivieren
@@ -30,21 +28,18 @@
name: "cgid"
notify:
- restart apache
- tags: [apache]
# symlink /etc/apache2/conf-available/serve-cgi-bin.conf to /etc/apache2/conf-enabled/
- name: CGI-Extension-Config aktivieren
command: "/usr/sbin/a2enconf serve-cgi-bin" # noqa 301
notify:
- restart apache
- tags: [apache]
### STARTSEITE INSTALLIEREN ###
- name: alte Startseite löschen
file:
path: "/var/www/html/index.html"
state: absent
- tags: [apache]
- name: Startseite neu installieren
blockinfile:
@@ -71,7 +66,6 @@
</body>
</html>
insertafter: EOF
- tags: [apache]
- name: set HTTP timeout
lineinfile:
@@ -81,4 +75,3 @@
state: present
notify:
- restart apache
- tags: [apache]
diff --git a/tasks/configure-crontab.yml b/tasks/configure-crontab.yml
index 4294523..7de424f 100644
--- a/tasks/configure-crontab.yml
+++ b/tasks/configure-crontab.yml
@@ -10,4 +10,3 @@
minute: "0"
user: "{{ vault_users.0.name }}"
job: 'find /tmp/ -maxdepth 1 -name "tmpfile*" -mtime +1 -exec rm \{\} \; >/dev/null 2>&1'
- tags: [cron]
diff --git a/tasks/configure-iptables.yml b/tasks/configure-iptables.yml
index 6ac24ea..19be08f 100644
--- a/tasks/configure-iptables.yml
+++ b/tasks/configure-iptables.yml
@@ -18,4 +18,3 @@
loop: "{{ vault_iptables|flatten(levels=1) }}"
notify:
- save iptables rules
- tags: [iptables]
diff --git a/tasks/configure-nfs-mounts.yml b/tasks/configure-nfs-mounts.yml
index ae92a1b..d62f545 100644
--- a/tasks/configure-nfs-mounts.yml
+++ b/tasks/configure-nfs-mounts.yml
@@ -3,7 +3,6 @@
file:
path: "{{ vault_nfs_mounts.log.mountpoint }}{{ ansible_hostname }}"
state: directory
- tags: [log]
- name: NFS-Shares fuer Logging mounten
mount:
@@ -12,4 +11,4 @@
state: mounted
fstype: "nfs"
opts: "defaults,nodev,nosuid,rsize=65536,wsize=65536,vers=3"
- tags: [log, notest]
+ tags: [notest]
diff --git a/tasks/configure_local_mounts.yml b/tasks/configure_local_mounts.yml
index 66af67f..2a2eb80 100644
--- a/tasks/configure_local_mounts.yml
+++ b/tasks/configure_local_mounts.yml
@@ -7,4 +7,3 @@
path: "/tmp"
src: "tmpfs"
state: mounted
- tags: [mount]
diff --git a/tasks/create-users-groups.yml b/tasks/create-users-groups.yml
index 058a3f7..f6b00ac 100644
--- a/tasks/create-users-groups.yml
+++ b/tasks/create-users-groups.yml
@@ -4,7 +4,6 @@
name: "{{ item.name }}"
gid: "{{ item.gid }}"
loop: "{{ vault_groups | flatten(levels=1) }}"
- tags: [users]
- name: User in Gruppen einfügen und primäre Gruppe setzen
user:
@@ -12,4 +11,3 @@
group: "{{ item.group }}"
groups: "{{ item.groups }}"
loop: "{{ vault_users | flatten(levels=1) }}"
- tags: [users]
diff --git a/tasks/install-callas-pdf-engine.yml b/tasks/install-callas-pdf-engine.yml
index 3d42893..03816d3 100644
--- a/tasks/install-callas-pdf-engine.yml
+++ b/tasks/install-callas-pdf-engine.yml
@@ -4,7 +4,6 @@
path: "/usr/lib/cgi-bin/"
state: directory
mode: "0755"
- tags: [callaspdf]
- name: remove old version of callas PDFEngine
file:
@@ -12,12 +11,10 @@
state: absent
loop:
- "/usr/local/lib/callas_pdfEngine_SDK_x64"
- tags: [callaspdf]
- name: create new dest directory for callas PDFEngine
file:
path: "/usr/local/lib/callas_pdfEngine_SDK_x64"
state: directory
- tags: [callaspdf]
# get latest version of callas PDFEngine at http://www.callassoftware.com/extranet/callas_pdfEngineSDK/callas_pdfEngineSDK_x64_Linux.tar.gz
# downloading with unarchive will be deprecated, so we use a separate copy task
@@ -27,7 +24,6 @@
src: "pdf_treatment/callas_pdfEngineSDK_x64_Linux_{{ vault_callas_sdk_version }}.tar.gz"
# dest: "/home/{{ vault_users[0].name }}/"
dest: "/usr/local/lib/"
- tags: [callaspdf]
# caution, don't extract to /tmp (https://github.com/ansible/ansible/issues/28569)
- name: unpack callas PDFEngine
@@ -37,13 +33,11 @@
dest: "/usr/local/lib/callas_pdfEngine_SDK_x64"
remote_src: true
follow: "yes"
- tags: [callaspdf]
- name: ... and remove source (as there's no actual move module in Ansible).
file:
path: "/usr/local/lib/callas_pdfEngineSDK_x64_Linux_{{ vault_callas_sdk_version }}.tar.gz"
state: absent
- tags: [callaspdf]
- name: set permissions
file:
@@ -51,7 +45,6 @@
group: "www-data"
recurse: true
state: directory
- tags: [callaspdf]
# symlink callas PDFEngine from '/home/lza/callas_pdfEngine_SDK_x64/lib' to '/usr/lib/cgi-bin/lib'
- name: symlink callas PDFEngine from '/usr/local/lib/callas_pdfEngine_SDK_x64/*' to '/usr/lib/cgi-bin/*'
@@ -62,7 +55,6 @@
loop:
- "lib"
- "lang"
- tags: [callaspdf]
- name: Symlinks auf mitgelieferte libstdc++ löschen
file:
@@ -71,13 +63,11 @@
loop:
- "/usr/local/lib/callas_pdfEngine_SDK_x64/lib/libstdc++.so"
- "/usr/local/lib/callas_pdfEngine_SDK_x64/lib/libstdc++.so.6"
- tags: [callaspdf]
- name: install packages
apt:
name: "libstdc++-8-dev"
state: present
- tags: [callaspdf]
- name: Symlinks auf Systemlibraries erstellen
file:
@@ -90,7 +80,6 @@
- src: "/usr/lib/x86_64-linux-gnu/libstdc++.so.6"
dest: "/usr/local/lib/callas_pdfEngine_SDK_x64/callas_pdfEngineSDK_x64_Linux_{{ vault_callas_sdk_version }}/lib/libstdc++.so.6"
notify: run ldconfig to configure dynamic linker run-time bindings
- tags: [callaspdf]
# provide fonts for callas
- name: create font-cache folder
@@ -100,7 +89,6 @@
mode: "0775"
owner: "www-data"
group: "www-data"
- tags: [callaspdf]
# install applefonts
- name: copy applefonts
@@ -110,4 +98,3 @@
follow: "yes"
notify:
- run fc-cache to rebuild font information cache files and add applefonts
- tags: [callaspdf]
diff --git a/tasks/install-converters.yml b/tasks/install-converters.yml
index 30ffec6..58903a7 100644
--- a/tasks/install-converters.yml
+++ b/tasks/install-converters.yml
@@ -5,4 +5,3 @@
src: "pdf_treatment/convert_to_pdfa.bin"
dest: "/usr/lib/cgi-bin/convert_to"
mode: "0755"
- tags: [converters]
diff --git a/tasks/install-packages.yml b/tasks/install-packages.yml
index b39bfde..73631d2 100644
--- a/tasks/install-packages.yml
+++ b/tasks/install-packages.yml
@@ -3,7 +3,6 @@
- name: apt-get update
apt:
update_cache: "yes"
- tags: [apt]
- name: Install/Update Debian packages
apt:
@@ -42,7 +41,6 @@
'ttf-mscorefonts-installer',
'unzip'
]
- tags: [apt]
- name: remove unnecessary packages
apt:
@@ -50,4 +48,3 @@
name: [
'libtiff-tools'
]
- tags: [apt]
diff --git a/tasks/install-validators.yml b/tasks/install-validators.yml
index 2af946a..9e3749c 100644
--- a/tasks/install-validators.yml
+++ b/tasks/install-validators.yml
@@ -6,4 +6,3 @@
src: "pdf_treatment/validate_pdfa.bin"
dest: "/usr/lib/cgi-bin/is_valid"
mode: "0755"
- tags: [validators]
--
GitLab