cleanup tags in playbooks

33 files changed, 54 insertions, 58 deletions

diff --git a/playbooks/archiver.yml b/playbooks/archiver.yml
index 6c6e891..2b8f4db 100644
--- a/playbooks/archiver.yml
+++ b/playbooks/archiver.yml
@@ -1,8 +1,8 @@
 - name: configure archiver
   hosts: archive_servers
-  tags: archive,archiver
   roles:
     - role: common
       tags: common
 
     - role: archive_server
+      tags: archive,archiver
diff --git a/playbooks/asterisk.yml b/playbooks/asterisk.yml
index 76bbe40..0d4bb24 100644
--- a/playbooks/asterisk.yml
+++ b/playbooks/asterisk.yml
@@ -1,11 +1,11 @@
 - name: configure asterisk pbx
   hosts: asterisk_servers
-  tags: asterisk
   roles:
     - role: common
       tags: common
 
     - role: asterisk
+      tags: asterisk
 
     - role: archive_job
       archive_name: asterisk
diff --git a/playbooks/bitwarden.yml b/playbooks/bitwarden.yml
index 1e7529d..3bed1a9 100644
--- a/playbooks/bitwarden.yml
+++ b/playbooks/bitwarden.yml
@@ -1,11 +1,11 @@
 - name: configure vaultwarden
   hosts: bitwarden_servers
-  tags: vaultwarden,bitwarden
   roles:
     - role: common
       tags: common
 
     - role: vaultwarden
+      tags: vaultwarden,bitwarden
 
     - role: apache_vhost
       apache_default_vhost: yes
diff --git a/playbooks/common.yml b/playbooks/common.yml
index c6c21fd..b8f8f31 100644
--- a/playbooks/common.yml
+++ b/playbooks/common.yml
@@ -1,6 +1,5 @@
 - name: apply base configuration to all hosts
   hosts: el
-  gather_facts: no
-  tags: common
   roles:
-    - common
+    - role: common
+      tags: common
diff --git a/playbooks/cups.yml b/playbooks/cups.yml
index ed67eb1..5a519a1 100644
--- a/playbooks/cups.yml
+++ b/playbooks/cups.yml
@@ -1,11 +1,11 @@
 - name: configure cups
   hosts: cups_servers
-  tags: cups
   roles:
     - role: common
       tags: common
 
     - role: cups_server
+      tags: cups
 
     - role: archive_job
       archive_name: cups
diff --git a/playbooks/dav.yml b/playbooks/dav.yml
index 69b6167..c87d204 100644
--- a/playbooks/dav.yml
+++ b/playbooks/dav.yml
@@ -1,11 +1,11 @@
 - name: configure sabredav
   hosts: dav_servers
-  tags: sabredav,dav
   roles:
     - role: common
       tags: common
 
     - role: sabredav
+      tags: sabredav,dav
 
     - role: apache_vhost
       apache_default_vhost: yes
diff --git a/playbooks/dev_servers.yml b/playbooks/dev_servers.yml
index 7530b05..d7eedf8 100644
--- a/playbooks/dev_servers.yml
+++ b/playbooks/dev_servers.yml
@@ -1,8 +1,8 @@
 - name: configure development environment
   hosts: dev_servers
-  tags: dev
   roles:
     - role: common
       tags: common
 
     - role: dev_environment
+      tags: dev
diff --git a/playbooks/dns_records.yml b/playbooks/dns_records.yml
index 93d635e..892e4c1 100644
--- a/playbooks/dns_records.yml
+++ b/playbooks/dns_records.yml
@@ -1,12 +1,10 @@
 - name: add dns records for infrastructure hosts
   hosts: proxmox_hypervisors:opnsense_firewalls:unmanaged
-  tags: dns
   roles:
     - dns_records
 
 - name: add reverse dns records for firewall vlan interfaces
   hosts: freeipa_master
-  tags: dns
   tasks:
     - name: create reverse dns zones
       ipadnszone:
diff --git a/playbooks/freeipa.yml b/playbooks/freeipa.yml
index ede053b..77ba9b3 100644
--- a/playbooks/freeipa.yml
+++ b/playbooks/freeipa.yml
@@ -1,11 +1,14 @@
-- name: configure freeipa master
-  hosts: freeipa_master
-  tags: freeipa
+- name: apply base configuration
+  hosts: freeipa_servers
   roles:
     - role: common
       tags: common
 
+- name: configure freeipa master
+  hosts: freeipa_master
+  roles:
     - role: freeipa_server
+      tags: freeipa
 
     - role: archive_job
       archive_name: ipa
@@ -16,11 +19,10 @@
         -exec cp --preserve=timestamps -vr {} . \;
         -exec rm -vrf {} \; &&
         find . -mindepth 1 -type d -exec chmod -v 770 {} +
-
       tags: archive
 
 - name: configure freeipa replicas
   hosts: freeipa_servers:!freeipa_master
-  tags: freeipa
   roles:
-    - freeipa_server
+    - role: freeipa_server
+      tags: freeipa
diff --git a/playbooks/freeipa_bootstrap.yml b/playbooks/freeipa_bootstrap.yml
index 224abe5..1d6b2ff 100644
--- a/playbooks/freeipa_bootstrap.yml
+++ b/playbooks/freeipa_bootstrap.yml
@@ -1,9 +1,9 @@
 - name: configure freeipa master
   hosts: freeipa_master
-  tags: freeipa
   roles:
     - role: common
       bootstrap: yes
       tags: common
 
     - role: freeipa_server
+      tags: freeipa
diff --git a/playbooks/freeipa_replica.yml b/playbooks/freeipa_replica.yml
index a313439..2ed7f17 100644
--- a/playbooks/freeipa_replica.yml
+++ b/playbooks/freeipa_replica.yml
@@ -1,8 +1,8 @@
 - name: configure freeipa replicas
   hosts: freeipa_servers:!freeipa_master
-  tags: freeipa
   roles:
     - role: common
       tags: common
 
     - role: freeipa_replica
+      tags: freeipa
diff --git a/playbooks/git.yml b/playbooks/git.yml
index 6833467..2c8fa04 100644
--- a/playbooks/git.yml
+++ b/playbooks/git.yml
@@ -1,12 +1,11 @@
 - name: configure git repository
   hosts: git_servers
-  tags: git
   roles:
     - role: common
       tags: common
 
     - role: gitolite
-      tags: gitolite
+      tags: gitolite,git
 
     - role: archive_job
       archive_name: gitolite
@@ -15,7 +14,7 @@
       tags: archive
 
     - role: cgit
-      tags: cgit
+      tags: cgit,git
 
     - role: apache_vhost
       apache_default_vhost: yes
diff --git a/playbooks/jellyfin.yml b/playbooks/jellyfin.yml
index 4b68d82..71ab3fb 100644
--- a/playbooks/jellyfin.yml
+++ b/playbooks/jellyfin.yml
@@ -1,11 +1,11 @@
 - name: configure jellyfin
   hosts: jellyfin_servers
-  tags: jellyfin
   roles:
     - role: common
       tags: common
 
     - role: jellyfin
+      tags: jellyfin
 
     - role: apache_vhost
       apache_default_vhost: yes
diff --git a/playbooks/mail.yml b/playbooks/mail.yml
index ce272a9..b34bc48 100644
--- a/playbooks/mail.yml
+++ b/playbooks/mail.yml
@@ -1,14 +1,14 @@
-- name: run common roles
+- name: apply base configuration
   hosts: rspamd_servers,mail_servers,imap_servers
-  tags: common
   roles:
-    - common
+    - role: common
+      tags: common
 
 - name: configure rspamd
   hosts: rspamd_servers
-  tags: rspamd
   roles:
     - role: rspamd
+      tags: rspamd
 
     - role: apache_vhost
       apache_default_vhost: yes
@@ -22,15 +22,15 @@
 
 - name: configure postfix
   hosts: mail_servers
-  tags: postfix,smtp
   roles:
     - role: postfix_server
+      tags: postfix,smtp
 
 - name: configure dovecot
   hosts: imap_servers
-  tags: dovecot,imap
   roles:
     - role: dovecot
+      tags: dovecot,imap
 
     - role: archive_job
       archive_name: dovecot
diff --git a/playbooks/nagios.yml b/playbooks/nagios.yml
index d0ff488..3d5c512 100644
--- a/playbooks/nagios.yml
+++ b/playbooks/nagios.yml
@@ -1,11 +1,11 @@
 - name: configure nagios
   hosts: nagios_servers
-  tags: nagios
   roles:
     - role: common
       tags: common
 
     - role: nagios_server
+      tags: nagios
 
     - role: apache_vhost
       apache_default_vhost: yes
diff --git a/playbooks/nameservers.yml b/playbooks/nameservers.yml
index 8241208..1f7d7b5 100644
--- a/playbooks/nameservers.yml
+++ b/playbooks/nameservers.yml
@@ -1,8 +1,8 @@
 - name: configure nsd
   hosts: authoritative_nameservers
-  tags: nsd
   roles:
     - role: common
       tags: common
 
     - role: nsd
+      tags: nsd
diff --git a/playbooks/nfs.yml b/playbooks/nfs.yml
index 0c96231..a47f09c 100644
--- a/playbooks/nfs.yml
+++ b/playbooks/nfs.yml
@@ -1,8 +1,8 @@
 - name: configure nfs exports
   hosts: nfs_servers
-  tags: nfs
   roles:
     - role: common
       tags: common
 
     - role: nfs_server
+      tags: nfs
diff --git a/playbooks/photostructure.yml b/playbooks/photostructure.yml
index d94ddc7..95f868e 100644
--- a/playbooks/photostructure.yml
+++ b/playbooks/photostructure.yml
@@ -1,11 +1,11 @@
 - name: configure photostructure
   hosts: photostructure_servers
-  tags: photostructure
   roles:
     - role: common
       tags: common
 
     - role: photostructure
+      tags: photostructure
 
     - role: apache_vhost
       apache_default_vhost: yes
diff --git a/playbooks/postgres.yml b/playbooks/postgres.yml
index fb7f7aa..45dc23f 100644
--- a/playbooks/postgres.yml
+++ b/playbooks/postgres.yml
@@ -1,11 +1,11 @@
 - name: configure postgresql
   hosts: postgresql_servers
-  tags: postgres,postgresql
   roles:
     - role: common
       tags: common
 
     - role: postgresql_server
+      tags: postgres,postgresql
 
     - role: archive_job
       archive_name: postgres
diff --git a/playbooks/proxmox_instance.yml b/playbooks/proxmox_instance.yml
index f326b4a..8e3c668 100644
--- a/playbooks/proxmox_instance.yml
+++ b/playbooks/proxmox_instance.yml
@@ -1,5 +1,5 @@
 - name: build proxmox virtual machine
   hosts: proxmox_instances
-  tags: proxmox
   roles:
-    - proxmox_instance
+    - role: proxmox_instance
+      tags: proxmox
diff --git a/playbooks/radius.yml b/playbooks/radius.yml
index 59140b9..7316718 100644
--- a/playbooks/radius.yml
+++ b/playbooks/radius.yml
@@ -1,8 +1,8 @@
 - name: configure freeradius
   hosts: radius_servers
-  tags: freeradius,radius
   roles:
     - role: common
       tags: common
 
     - role: freeradius
+      tags: freeradius,radius
diff --git a/playbooks/syncthing.yml b/playbooks/syncthing.yml
index e93745d..84c3bfc 100644
--- a/playbooks/syncthing.yml
+++ b/playbooks/syncthing.yml
@@ -1,11 +1,11 @@
 - name: configure syncthing
   hosts: syncthing_servers
-  tags: syncthing
   roles:
     - role: common
       tags: common
 
     - role: syncthing
+      tags: syncthing
 
     - role: archive_job
       archive_name: syncthing
diff --git a/playbooks/syslog.yml b/playbooks/syslog.yml
index abf3cc3..46aa810 100644
--- a/playbooks/syslog.yml
+++ b/playbooks/syslog.yml
@@ -1,8 +1,8 @@
 - name: configure rsyslog server
   hosts: syslog_servers
-  tags: rsyslog,syslog
   roles:
     - role: common
       tags: common
 
     - role: rsyslog_server
+      tags: rsyslog,syslog
diff --git a/playbooks/test.yml b/playbooks/test.yml
deleted file mode 100644
index f3eaa62..0000000
--- a/playbooks/test.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- hosts: all
-  tasks:
-    - debug:
-        var: vlan
diff --git a/playbooks/ttrss.yml b/playbooks/ttrss.yml
index 337258e..ddc84a3 100644
--- a/playbooks/ttrss.yml
+++ b/playbooks/ttrss.yml
@@ -6,6 +6,11 @@
       tags: common
 
     - role: ttrss
+      tags: ttrss
+
+    - role: php
+      php_fpm_environment: '{{ ttrss_php_environment }}'
+      tags: php
 
     - role: apache_vhost
       apache_default_vhost: yes
@@ -13,7 +18,3 @@
       apache_document_root: '{{ ttrss_home }}'
       apache_config: '{{ ttrss_apache_config }}'
       tags: apache
-
-    - role: php
-      php_fpm_environment: '{{ ttrss_php_environment }}'
-      tags: php
diff --git a/playbooks/turn.yml b/playbooks/turn.yml
index 42832d6..5ca4915 100644
--- a/playbooks/turn.yml
+++ b/playbooks/turn.yml
@@ -1,8 +1,8 @@
 - name: configure coturn
   hosts: turn_servers
-  tags: coturn,turn
   roles:
     - role: common
       tags: common
 
     - role: coturn
+      tags: coturn,turn
diff --git a/playbooks/unifi.yml b/playbooks/unifi.yml
index 667ff1b..73bbcf9 100644
--- a/playbooks/unifi.yml
+++ b/playbooks/unifi.yml
@@ -1,11 +1,11 @@
 - name: configure unifi controller
   hosts: unifi_controllers
-  tags: unifi
   roles:
     - role: common
       tags: common
 
     - role: unifi
+      tags: unifi
 
     - role: archive_job
       archive_name: unifi
diff --git a/playbooks/webserver_internal.yml b/playbooks/webserver_internal.yml
index 90ffdb3..31f9c3a 100644
--- a/playbooks/webserver_internal.yml
+++ b/playbooks/webserver_internal.yml
@@ -1,6 +1,5 @@
 - name: configure internal web servers
   hosts: www1
-  tags: apache
   roles:
     - role: common
       tags: common
@@ -22,9 +21,9 @@
           AllowOverride None
           Require all granted
         </Directory>
+    tags: apache
   tasks:
     - name: generate index.html
-      tags: apache
       copy:
         dest: /var/www/html/index.html
         content: |
@@ -43,3 +42,4 @@
             </ul>
           </body
           </html>
+      tags: apache
diff --git a/playbooks/webserver_public.yml b/playbooks/webserver_public.yml
index b362eed..b509e85 100644
--- a/playbooks/webserver_public.yml
+++ b/playbooks/webserver_public.yml
@@ -13,13 +13,13 @@
       tags: apache
 
     - role: archive_job
-      tags: archive
       archive_name: www
       archive_shell: >-
         TIMESTAMP=$(date +%Y%m%d%H%M%S);
         tar czf "www-${TIMESTAMP}.tar.gz"
         --transform "s|^\.|www-${TIMESTAMP}|"
         -C "{{ apache_public_dir }}" {% for dir in apache_backup_dirs %}{{ dir | quote }} {% endfor %}
+      tags: archive
 
     # prosody letsencrypt proxy
     - role: prosody_letsencrypt_proxy
diff --git a/playbooks/wiki.yml b/playbooks/wiki.yml
index bb7d25d..9e8aef8 100644
--- a/playbooks/wiki.yml
+++ b/playbooks/wiki.yml
@@ -1,11 +1,11 @@
 - name: configure mediawiki
   hosts: wiki_servers
-  tags: wiki,mediawiki
   roles:
     - role: common
       tags: common
 
     - role: mediawiki
+      tags: wiki,mediawiki
 
     - role: apache_vhost
       apache_default_vhost: yes
diff --git a/playbooks/xmpp.yml b/playbooks/xmpp.yml
index 6d86a88..ecf0e8a 100644
--- a/playbooks/xmpp.yml
+++ b/playbooks/xmpp.yml
@@ -1,8 +1,8 @@
 - name: configure prosody
   hosts: xmpp_servers
-  tags: xmpp,prosody
   roles:
     - role: common
       tags: common
 
     - role: prosody
+      tags: xmpp,prosody
diff --git a/playbooks/yum.yml b/playbooks/yum.yml
index 9f93b8f..67b3e20 100644
--- a/playbooks/yum.yml
+++ b/playbooks/yum.yml
@@ -1,11 +1,11 @@
 - name: configure yum mirrors
   hosts: yum_mirrors
-  tags: yum
   roles:
     - role: common
       tags: common
 
     - role: yum_mirror
+      tags: yum
 
     - role: apache_vhost
       apache_default_vhost: yes
@@ -14,11 +14,11 @@
       apache_redirect_to_https: no
       tags: apache
 
-- name: configure mirror for local packages
+- name: configure local package repository
   hosts: yum_mirrors
-  tags: yum
   roles:
     - role: yum_disable_default_repos
+      tags: yum
 
     - role: yum
       yum_repositories:
@@ -26,6 +26,7 @@
         - rocky-appstream
         - rocky-extras
         - epel
+      tags: yum
 
     # nagios_client has to run *after* EPEL repository has been configured.
     - role: nagios_client
diff --git a/playbooks/znc.yml b/playbooks/znc.yml
index 34d6ada..c54db47 100644
--- a/playbooks/znc.yml
+++ b/playbooks/znc.yml
@@ -1,11 +1,11 @@
 - name: configure znc
   hosts: znc_servers
-  tags: znc
   roles:
     - role: common
       tags: common
 
     - role: znc
+      tags: znc
 
     - role: archive_job
       archive_name: znc