Handlers: move all handlers into their roles, again

playbooks/gateways.yml

@@ -3,7 +3,6 @@
 - hosts: ffmwu-gateways
   remote_user: admin
   roles:
-    - handlers
     - prerequisites
     - server-apt-repos
     - server-basic

roles/handlers/handlers/main.yml

@@ -1,89 +0,0 @@
----
-- name: reload systemd
-  systemd:
-    daemon_reload: yes
-
-- name: reload network interfaces
-  systemd:
-    name: networking
-    state: reloaded
-
-- name: activate sysfs variables
-  systemd:
-    name: sysfsutils
-    state: restarted
-
-- name: restart bind9
-  systemd:
-    name: bind9
-    state: restarted
-
-- name: reload systemd unit bird
-  systemd:
-    name: bird
-    state: reloaded
-
-- name: reload systemd unit bird6
-  systemd:
-    name: bird6
-    state: reloaded
-
-- name: restart fastd intragate instances
-  systemd:
-    name: "fastd@{{ item.0.id }}igvpn-{{ item.1.mtu }}"
-    state: restarted
-  with_subelements:
-    - "{{ meshes }}"
-    - fastd.intragate.instances
-
-- name: restart fastd mesh instances
-  systemd:
-    name: "fastd@{{ item.0.id }}vpn-{{ item.1.mtu }}"
-    state: restarted
-  with_subelements:
-    - "{{ meshes }}"
-    - fastd.nodes.instances
-
-- name: restart systemd unit radvd
-  systemd:
-    name: radvd
-    state: restarted
-
-- name: restart respondd
-  systemd:
-    name: "respondd-{{ item.id }}"
-    state: restarted
-  with_items: "{{ meshes }}"
-
-- name: restart systemd unit tinc
-  systemd:
-    name: "tinc@{{ icvpn.interface }}"
-    enabled: yes
-    state: restarted
-
-- name: restart systemd unit ffmwu-static-routes
-  systemd:
-    name: ffmwu-static-routes
-    state: restarted
-
-- name: restart systemd unit ffmwu-ip-rules
-  systemd:
-    name: ffmwu-ip-rules
-    state: restarted
-
-- name: restart respondd
-  systemd:
-    name: "respondd-{{ item.id }}"
-    state: restarted
-  with_items: "{{ meshes }}"
-
-- name: iptables-restore
-  shell: iptables-restore < /etc/iptables/rules.v4
-
-- name: ip6tables-restore
-  shell: ip6tables-restore < /etc/iptables/rules.v6
-
-- name: reload nginx
-  systemd:
-    name: nginx
-    state: reloaded

roles/network-batman/handlers/main.yml

@@ -0,0 +1,5 @@
+---
+- name: reload network interfaces
+  systemd:
+    name: networking
+    state: reloaded

roles/network-fastd/handlers/main.yml

@@ -0,0 +1,5 @@
+---
+- name: reload network interfaces
+  systemd:
+    name: networking
+    state: reloaded

roles/network-ffrl/handlers/main.yml

@@ -0,0 +1,5 @@
+---
+- name: reload network interfaces
+  systemd:
+    name: networking
+    state: reloaded

roles/network-iptables-gateway/handlers/main.yml

@@ -0,0 +1,6 @@
+---
+- name: iptables-restore
+  shell: iptables-restore < /etc/iptables/rules.v4
+
+- name: ip6tables-restore
+  shell: ip6tables-restore < /etc/iptables/rules.v6

roles/network-meshbridge/handlers/main.yml

@@ -0,0 +1,10 @@
+---
+- name: reload network interfaces
+  systemd:
+    name: networking
+    state: reloaded
+
+- name: activate sysfs variables
+  systemd:
+    name: sysfsutils
+    state: restarted

roles/network-routing/handlers/main.yml

@@ -0,0 +1,14 @@
+---
+- name: reload systemd
+  systemd:
+    daemon_reload: yes
+
+- name: restart systemd unit ffmwu-static-routes
+  systemd:
+    name: ffmwu-static-routes
+    state: restarted
+
+- name: restart systemd unit ffmwu-ip-rules
+  systemd:
+    name: ffmwu-ip-rules
+    state: restarted

roles/server-basic/handlers/main.yml

@@ -0,0 +1,4 @@
+---
+- name: reload systemd
+  systemd:
+    daemon_reload: yes

roles/service-bind-slave/handlers/main.yml

@@ -0,0 +1,9 @@
+---
+- name: reload systemd
+  systemd:
+    daemon_reload: yes
+
+- name: restart bind9
+  systemd:
+    name: bind9
+    state: restarted

roles/service-bird-ffrl/handlers/main.yml

@@ -0,0 +1,10 @@
+---
+- name: reload systemd unit bird
+  systemd:
+    name: bird
+    state: reloaded
+
+- name: reload systemd unit bird6
+  systemd:
+    name: bird6
+    state: reloaded

roles/service-bird-icvpn/handlers/main.yml

@@ -0,0 +1,14 @@
+---
+- name: reload systemd
+  systemd:
+    daemon_reload: yes
+
+- name: reload systemd unit bird
+  systemd:
+    name: bird
+    state: reloaded
+
+- name: reload systemd unit bird6
+  systemd:
+    name: bird6
+    state: reloaded

roles/service-bird/handlers/main.yml

@@ -0,0 +1,10 @@
+---
+- name: reload systemd unit bird
+  systemd:
+    name: bird
+    state: reloaded
+
+- name: reload systemd unit bird6
+  systemd:
+    name: bird6
+    state: reloaded

roles/service-dhcpd/handlers/main.yml

@@ -1,4 +1,8 @@
 ---
+- name: reload systemd
+  systemd:
+    daemon_reload: yes
+
 - name: restart kea-dhcp4-server
   systemd:
     name: kea-dhcp4-server

roles/service-fastd-intragate/handlers/main.yml

@@ -0,0 +1,8 @@
+---
+- name: restart fastd intragate instances
+  systemd:
+    name: "fastd@{{ item.0.id }}igvpn-{{ item.1.mtu }}"
+    state: restarted
+  with_subelements:
+    - "{{ meshes }}"
+    - fastd.intragate.instances

roles/service-fastd-mesh/handlers/main.yml

@@ -0,0 +1,12 @@
+---
+- name: reload systemd
+  systemd:
+    daemon_reload: yes
+
+- name: restart fastd mesh instances
+  systemd:
+    name: "fastd@{{ item.0.id }}vpn-{{ item.1.mtu }}"
+    state: restarted
+  with_subelements:
+    - "{{ meshes }}"
+    - fastd.nodes.instances

roles/service-fastd/handlers/main.yml

@@ -0,0 +1,4 @@
+---
+- name: reload systemd
+  systemd:
+    daemon_reload: yes

roles/service-nginx-firmware/handlers/main.yml

@@ -0,0 +1,9 @@
+---
+- name: reload systemd
+  systemd:
+    daemon_reload: yes
+
+- name: reload nginx
+  systemd:
+    name: nginx
+    state: reloaded

roles/service-nginx/handlers/main.yml

@@ -0,0 +1,5 @@
+---
+- name: reload nginx
+  systemd:
+    name: nginx
+    state: reloaded

roles/service-radvd/handlers/main.yml

@@ -0,0 +1,5 @@
+---
+- name: restart systemd unit radvd
+  systemd:
+    name: radvd
+    state: restarted

roles/service-respondd/handlers/main.yml

@@ -0,0 +1,10 @@
+---
+- name: reload systemd
+  systemd:
+    daemon_reload: yes
+
+- name: restart respondd
+  systemd:
+    name: "respondd-{{ item.id }}"
+    state: restarted
+  with_items: "{{ meshes }}"

roles/service-tinc/handlers/main.yml

@@ -0,0 +1,10 @@
+---
+- name: reload systemd
+  systemd:
+    daemon_reload: yes
+
+- name: restart systemd unit tinc
+  systemd:
+    name: "tinc@{{ icvpn.interface }}"
+    enabled: yes
+    state: restarted