From 09793704188de9b6cf7db07a5bc6e16f08c80fea Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Sat, 27 Nov 2021 22:16:29 +0100
Subject: [PATCH] Add motd for most plays

---
 bdd.yml                               |  4 ++++
 matrix.yml                            |  5 +++++
 network.yml                           | 23 ++++++++++++++++++++---
 roles/docker/tasks/main.yml           |  9 ---------
 roles/re2o_service/tasks/main.yml     | 10 ----------
 roles/unifi_controller/tasks/main.yml |  9 ---------
 services_web.yml                      |  4 ++++
 7 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/bdd.yml b/bdd.yml
index f3fa7d3..eceddaf 100644
--- a/bdd.yml
+++ b/bdd.yml
@@ -2,6 +2,10 @@
 ---
 # Install and configure bdd servers at Saclay and at OVH
 - hosts: bdd,!re2o-bdd.adm.auro.re,!services-bdd-local.adm.auro.re
+  vars:
+    router:
+      postgresql: PostgreSQL est déployé.
   roles:
     - postgresql_server
+    - update_motd
 ...
diff --git a/matrix.yml b/matrix.yml
index be54c53..ac3f4ce 100755
--- a/matrix.yml
+++ b/matrix.yml
@@ -5,12 +5,17 @@
   vars:
     mxisd_releases: https://github.com/kamax-matrix/mxisd/releases
     mxisd_deb: "{{ mxisd_releases }}/download/v1.3.1/mxisd_1.3.1_all.deb"
+    router:
+      matrix-synapse: matrix-synapse est déployé.
+      matrix-appservice-irc: matrix-appservice-irc est déployé.
+      matrix-appservice-webhooks: matrix-appservice-webhooks est déployé.
   roles:
     - debian_backports
     - nodejs
     - matrix_synapse
     - matrix_appservice_irc
     - matrix_appservice_webhooks
+    - update_motd
 
 # Install Matrix services
 - hosts: matrix-services.adm.auro.re
diff --git a/network.yml b/network.yml
index 50fde19..c389c24 100755
--- a/network.yml
+++ b/network.yml
@@ -2,35 +2,52 @@
 ---
 # Set up DHCP servers.
 - hosts: dhcp-*.adm.auro.re
+  vars:
+    update_motd:
+      unbound: isc-dhcp-server est déployé.
   roles:
     - isc_dhcp_server
-
+    - update_motd
 
 # Deploy unbound DNS server (recursive).
 - hosts: dns-*.adm.auro.re,!dns-aurore*.adm.auro.re
+  vars:
+    update_motd:
+      unbound: Unbound est déployé.
   roles:
     - unbound
-
+    - update_motd
 
 # Déploiement du service re2o aurore-firewall et keepalived
 # radvd: IPv6 SLAAC (/64 subnets, private IPs).
 #   Must NOT be on routeur-aurore-*, or will with DHCPv6!
 - hosts: ~routeur-(pacaterie|edc|fleming|gs|rives).*\.adm\.auro\.re
+  vars:
+    router:
+      unbound: Le routage (avec radvd) est déployé.
   roles:
     - router
     - radvd
+    - update_motd
 
 # No radvd here
 - hosts: ~routeur-aurore.*\.adm\.auro\.re
+  vars:
+    router:
+      unbound: Le routage (avec DHCPv6) est déployé.
   roles:
     - router
     - ipv6_edge_router
+    - update_motd
 
 # Radius (backup only for now)
 - hosts: radius-*.adm.auro.re
+  vars:
+    router:
+      unbound: FreeRADIUS est déployé.
   roles:
     - radius
-
+    - update_motd
 
 # WIP: Deploy authoritative DNS servers
 # - hosts: authoritative_dns
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 38d3a55..a1ec160 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -50,13 +50,4 @@
     url: https://github.com/docker/compose/releases/download/1.24.1/docker-compose-Linux-x86_64
     dest: /usr/local/bin/docker-compose
     mode: "0755"
-
-- name: Configure MOTD
-  include_role:
-    name: update_motd
-  vars:
-    motd_messages:
-      - key: 10-docker
-        message: >-
-          Docker est installé sur ce serveur.
 ...
diff --git a/roles/re2o_service/tasks/main.yml b/roles/re2o_service/tasks/main.yml
index 2bed1a3..fb72045 100644
--- a/roles/re2o_service/tasks/main.yml
+++ b/roles/re2o_service/tasks/main.yml
@@ -39,14 +39,4 @@
     owner: "{{ service_user }}"
     group: nogroup
     state: link
-
-- name: Configure MOTD
-  include_role:
-    name: update_motd
-  vars:
-    motd_messages:
-      - key: "15-re2o-service-{{ service_name }}"
-        message: >-
-          Le service re2o {{ service_name }} est dans
-          {{ service_homedir }}/{{ service_name }}.
 ...
diff --git a/roles/unifi_controller/tasks/main.yml b/roles/unifi_controller/tasks/main.yml
index 811b5e1..ddabe3b 100644
--- a/roles/unifi_controller/tasks/main.yml
+++ b/roles/unifi_controller/tasks/main.yml
@@ -39,13 +39,4 @@
   register: apt_result
   retries: 3
   until: apt_result is succeeded
-
-- name: Configure MOTD
-  include_role:
-    name: update_motd
-  vars:
-    motd_messages:
-      - key: 10-unifi-controller
-        message: >-
-          Le contrôleur Unifi a été installé sur ce serveur.
 ...
diff --git a/services_web.yml b/services_web.yml
index c72321b..3beffd0 100755
--- a/services_web.yml
+++ b/services_web.yml
@@ -2,8 +2,12 @@
 ---
 # Deploy Docker hosts
 - hosts: docker-ovh.adm.auro.re,gitea.adm.auro.re,drone.adm.auro.re,stream.adm.auro.re,wikijs.adm.auro.re
+  vars:
+    router:
+      docker: Docker est déployé.
   roles:
     - docker
+    - update_motd
 
 # Deploy Passbolt
 - hosts: passbolt.adm.auro.re