Merge pull request 'Use update_motd everywhere' (#44) from use_update_motd_everywhere into master

Reviewed-on: Aurore/ansible#44

roles/baseconfig/tasks/main.yml

@@ -32,11 +32,6 @@
 - include_role:
     name: update_motd
 
-- name: Remove Debian warranty motd
-  file:
-    path: /etc/motd
-    state: absent
-
 # Configure APT mirrors on Debian Stretch
 - name: Configure APT mirrors
   when:

roles/docker/tasks/main.yml

@@ -51,8 +51,11 @@
     dest: /usr/local/bin/docker-compose
     mode: "0755"
 
-- name: Indicate role in motd
+- include_role:
-  template:
+    name: update_motd
-    src: update-motd.d/05-service.j2
+  vars:
-    dest: /etc/update-motd.d/05-docker
+    motd_messages:
-    mode: 0755
+      - key: 10-docker
+        message: >-
+          Docker est installé sur ce serveur.
+...

roles/nginx/tasks/main.yml

@@ -148,11 +148,13 @@
     group: www-data
     mode: 0644
 
-- name: Indicate role in motd
+- include_role:
-  template:
+    name: update_motd
-    src: update-motd.d/05-service.j2
+  vars:
-    dest: /etc/update-motd.d/05-nginx
+    motd_messages:
-    mode: 0755
+      - key: 10-nginx
+        message: >-
+          NGinx est installé sur ce serveur. Voir /etc/nginx.
 
 - name: Clean old files
   file:
@@ -162,3 +164,4 @@
     - "/etc/nginx/snippets/options-ssl.conf"
     - "/var/www/custom_401.html"
     - "/var/www/robots.txt"
+...

roles/re2o_service/tasks/main.yml

@@ -40,8 +40,12 @@
     group: nogroup
     state: link
 
-- name: Indicate in motd service location
+- include_role:
-  template:
+    name: update_motd
-    src: update-motd.d/05-service.j2
+  vars:
-    dest: "/etc/update-motd.d/05-re2o-{{ service_name }}"
+    motd_messages:
-    mode: 0755
+      - key: "15-re2o-service-{{ service_name }}"
+        message: >-
+          Le service re2o {{ service_name }} est dans
+          {{ service_homedir }}/{{ service_name }}.
+...

roles/unifi_controller/tasks/main.yml

@@ -40,8 +40,11 @@
   retries: 3
   until: apt_result is succeeded
 
-- name: Indicate role in motd
+- include_role:
-  template:
+    name: update_motd
-    src: update-motd.d/05-service.j2
+  vars:
-    dest: /etc/update-motd.d/05-unifi-controller
+    motd_messages:
-    mode: 0755
+      - key: 10-unifi-controller
+        message: >-
+          Le contrôleur Unifi a été installé sur ce serveur.
+...