Unify motd definition

playbooks/db.yml

@@ -6,11 +6,6 @@
   roles:
     - role: backup
       tags: [ backup ]
-    - role: motd
-      vars:
-        motd_watch_services_extra:
-          - postgresql
-      tags: [ motd ]
     - role: postgresql
       vars:
         postgresql_global_config_options:

playbooks/desktop.yml

@@ -25,8 +25,6 @@
         backup_s3backup_list_extra:
           - /home/salt/.backup/
       tags: [ backup ]
-    - role: motd
-      tags: [ motd ]
     - role: udev
       vars:
         udev_rules:

playbooks/game.yml

@@ -11,11 +11,6 @@
         backup_s3backup_exclude_list_extra:
           - /data/minecraft/valhelsia3/backups
       tags: [ backup ]
-    - role: motd
-      vars:
-        motd_watch_services_extra:
-          - docker
-      tags: [ motd ]
     - role: docker
       tags: [ docker, skip-pull ]
 - hosts: game1.desu.ltd

playbooks/pik8s.yml

@@ -7,12 +7,6 @@
   roles:
     - role: k8s
       tags: [ k8s, skip-pull ]
-    - role: motd
-      vars:
-        motd_watch_services_extra:
-          - docker
-          - kubelet
-      tags: [ k8s, motd ]
 - hosts: tags_pik8s-master
   gather_facts: no
   tasks:

playbooks/pistorage.yml

@@ -35,11 +35,6 @@
           - /srv/nfs/k8s/default/web-transmission-config-pvc
         backup_time: "Mon *-*-* 02:00:00"
       tags: [ backup ]
-    - role: motd
-      vars:
-        motd_watch_services_extra:
-          - docker
-          - postgresql
     - role: postgresql
       vars:
         postgresql_global_config_options:

playbooks/web.yml

@@ -47,13 +47,6 @@
           - /var/lib/gitea/log
           - /data/gitea/data/gitea/log
       tags: [ backup ]
-    - role: motd
-      vars:
-        motd_watch_services_extra:
-          - apache2
-          - docker
-          - php7.4-fpm
-      tags: [ motd ]
     - role: docker
       tags: [ web, docker, skip-pull ]
     - role: certbot
@@ -134,11 +127,6 @@
         backup_s3backup_list_extra:
           - /data
       tags: [ backup ]
-    - role: motd
-      vars:
-        motd_watch_services_extra:
-          - docker
-      tags: [ motd ]
     - role: docker
       tags: [ web, docker, skip-pull ]
 - hosts: web3.desu.ltd
@@ -190,10 +178,5 @@
         backup_s3backup_list_extra:
           - /data
       tags: [ backup ]
-    - role: motd
-      vars:
-        motd_watch_services_extra:
-          - docker
-      tags: [ motd ]
     - role: docker
       tags: [ web, docker, skip-pull ]

site.yml

@@ -8,6 +8,15 @@
       tags: [ common ]
     - role: adminuser
       tags: [ adminuser, common ]
+    - role: motd
+      vars:
+        motd_watch_services_extra:
+          - apache2
+          - docker
+          - kubelet
+          - php7.4-fpm
+          - postgresql
+      tags: [ motd, common ]
     - role: sshd
       vars:
         sshd: