ansible: Extract root-aliases role

Signed-off-by: Anders Kaseorg <[email protected]>

Author: andersk

ansible/roles/root-aliases/handlers/main.yml

@@ -0,0 +1,2 @@
+- name: newaliases
+  command: newaliases

ansible/roles/root-aliases/tasks/main.yml

@@ -0,0 +1,9 @@
+- name: Update /etc/aliases
+  lineinfile:
+    path: /etc/aliases
+    regexp: '^root:'
+    line: |
+      root: {% for maintainer in maintainers|rejectattr('root_mail', 'none') -%}
+      {{ maintainer.root_mail|default(maintainer.username + '@mit.edu') }}{{ '' if loop.last else ', ' }}
+      {%- endfor %}
+  notify: newaliases

ansible/scripts-directors.yml

@@ -49,6 +49,7 @@
   roles:
   - k5login
   - syslog-client
+  - root-aliases
   - ldirectord-status
   - lvs-iptables
   - lvs-lighttpd
@@ -85,15 +86,6 @@
       dest: /etc/nagios/nrpe_local.cfg
       src: files/nrpe_local.cfg
     notify: restart nrpe
-  - name: Update /etc/aliases
-    lineinfile:
-      path: /etc/aliases
-      regexp: '^root:'
-      line: |
-        root: {% for maintainer in maintainers|rejectattr('root_mail', 'none') -%}
-        {{ maintainer.root_mail|default(maintainer.username + '@mit.edu') }}{{ '' if loop.last else ', ' }}
-        {%- endfor %}
-    notify: newaliases
   - name: Load IPVS modules
     copy:
       dest: /etc/modules-load.d/lvs.conf
@@ -146,8 +138,6 @@
       dest: /etc/ha.d/ldirectord.cf
       src: files/ldirectord.cf
   handlers:
-  - name: newaliases
-    command: newaliases
   - name: load modules
     service: name=systemd-modules-load state=restarted
   - name: reload sysctl

ansible/scripts-syslog.yml

@@ -2,6 +2,7 @@
   serial: 1
   roles:
   - k5login
+  - root-aliases
   tasks:
   - name: Configure Kerberos
     debconf: name=krb5-config question=krb5-config/default_realm vtype=string value=ATHENA.MIT.EDU
@@ -19,15 +20,6 @@
     - libzephyr4-krb5
     - zephyr-clients
     - aptitude
-  - name: Update /etc/aliases
-    lineinfile:
-      path: /etc/aliases
-      regexp: '^root:'
-      line: |
-        root: {% for maintainer in maintainers|rejectattr('root_mail', 'none') -%}
-        {{ maintainer.root_mail|default(maintainer.username + '@mit.edu') }}{{ '' if loop.last else ', ' }}
-        {%- endfor %}
-    notify: newaliases
   - name: Start zhm
     service: name=zhm state=started
   - name: Install zephyr-syslog
@@ -87,8 +79,6 @@
     notify: restart rsyslog
 
   handlers:
-  - name: newaliases
-    command: newaliases
   - name: reload systemd
     systemd: daemon_reload=yes
   - name: restart [email protected]