commit 417c7ab12030401f7a1df99d342ec66f575855fa
parent c13230b58cefe699a2d26713644838afc0d3c86b
Author: Leah (ctucx) <leah@ctu.cx>
Date: Mon, 22 Feb 2021 19:06:05 +0100
parent c13230b58cefe699a2d26713644838afc0d3c86b
Author: Leah (ctucx) <leah@ctu.cx>
Date: Mon, 22 Feb 2021 19:06:05 +0100
handlers are weird and broken
32 files changed, 30 insertions(+), 80 deletions(-)
diff --git a/roles/acme-redirect/meta/main.yml b/roles/acme-redirect/meta/main.yml @@ -2,5 +2,3 @@ dependencies: - role: nftables-handler - when: - - network.nftables.enable is true
diff --git a/roles/acme-redirect/tasks/main.yml b/roles/acme-redirect/tasks/main.yml @@ -21,8 +21,7 @@ - services.acme_redirect.enable is defined - services.acme_redirect.enable is true -- name: Run handlers - meta: flush_handlers +- meta: flush_handlers - include: renew.yml when: @@ -34,5 +33,4 @@ - services.acme_redirect.enable is defined - services.acme_redirect.enable is false -- name: Run handlers - meta: flush_handlers- \ No newline at end of file +- meta: flush_handlers+ \ No newline at end of file
diff --git a/roles/bind/meta/main.yml b/roles/bind/meta/main.yml @@ -2,5 +2,3 @@ dependencies: - role: nftables-handler - when: - - network.nftables.enable is true
diff --git a/roles/bind/tasks/main.yml b/roles/bind/tasks/main.yml @@ -26,5 +26,4 @@ - services.bind.enable is defined - services.bind.enable is false -- name: Run handlers - meta: flush_handlers +- meta: flush_handlers
diff --git a/roles/cgit/meta/main.yml b/roles/cgit/meta/main.yml @@ -2,5 +2,3 @@ dependencies: - role: nginx - when: - - services.cgit.nginx.enable is true
diff --git a/roles/cgit/tasks/main.yml b/roles/cgit/tasks/main.yml @@ -32,5 +32,4 @@ - services.cgit.enable is defined - services.cgit.enable is false -- name: Run handlers - meta: flush_handlers +- meta: flush_handlers
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml @@ -37,5 +37,4 @@ - include: node-exporter.yml when: services.prometheus_node_exporter is defined -- name: Run handlers - meta: flush_handlers +- meta: flush_handlers
diff --git a/roles/dnsmasq/tasks/main.yml b/roles/dnsmasq/tasks/main.yml @@ -15,10 +15,10 @@ - services.dnsmasq.enable is defined - services.dnsmasq.enable is true -- name: Run handlers - meta: flush_handlers - - include: remove.yml when: - services.dnsmasq.enable is defined - services.dnsmasq.enable is false + +- meta: flush_handlers +
diff --git a/roles/fritzboxExporter/meta/main.yml b/roles/fritzboxExporter/meta/main.yml @@ -2,8 +2,4 @@ dependencies: - role: nginx - when: - - services.fritzboxExporter.nginx.enable is true - role: nftables-handler - when: - - network.nftables.enable is true
diff --git a/roles/fritzboxExporter/tasks/main.yaml b/roles/fritzboxExporter/tasks/main.yaml @@ -32,5 +32,4 @@ - services.fritzboxExporter.enable is defined - services.fritzboxExporter.enable is false -- name: Run handlers - meta: flush_handlers +- meta: flush_handlers
diff --git a/roles/frpc/tasks/main.yml b/roles/frpc/tasks/main.yml @@ -26,5 +26,4 @@ - services.frpc.enable is defined - services.frpc.enable is true -- name: Run handlers - meta: flush_handlers- \ No newline at end of file +- meta: flush_handlers+ \ No newline at end of file
diff --git a/roles/frps/meta/main.yml b/roles/frps/meta/main.yml @@ -2,8 +2,4 @@ dependencies: - role: nginx - when: - - services.frps.nginx.enable is true - role: nftables-handler - when: - - network.nftables.enable is true
diff --git a/roles/frps/tasks/main.yml b/roles/frps/tasks/main.yml @@ -32,5 +32,4 @@ - services.frps.enable is defined - services.frps.enable is true -- name: Run handlers - meta: flush_handlers- \ No newline at end of file +- meta: flush_handlers+ \ No newline at end of file
diff --git a/roles/grafana/meta/main.yml b/roles/grafana/meta/main.yml @@ -2,5 +2,3 @@ dependencies: - role: nginx - when: - - services.grafana.nginx.enable is true
diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml @@ -39,8 +39,7 @@ - services.grafana.enable is defined - services.grafana.enable is false -- name: Run handlers - meta: flush_handlers +- meta: flush_handlers
diff --git a/roles/hostapd/tasks/main.yml b/roles/hostapd/tasks/main.yml @@ -15,10 +15,9 @@ - services.hostapd.enable is defined - services.hostapd.enable is true -- name: Run handlers - meta: flush_handlers - - include: remove.yml when: - services.hostapd.enable is defined - services.hostapd.enable is false + +- meta: flush_handlers
diff --git a/roles/influxdb/meta/main.yml b/roles/influxdb/meta/main.yml @@ -2,5 +2,3 @@ dependencies: - role: nginx - when: - - services.influx.nginx.enable is true
diff --git a/roles/influxdb/tasks/main.yml b/roles/influxdb/tasks/main.yml @@ -32,5 +32,4 @@ - services.influxdb.enable is defined - services.influxdb.enable is false -- name: Run handlers - meta: flush_handlers- \ No newline at end of file +- meta: flush_handlers+ \ No newline at end of file
diff --git a/roles/maddy/tasks/main.yml b/roles/maddy/tasks/main.yml @@ -30,5 +30,4 @@ - services.maddy.enable is defined - services.maddy.enable is false -- name: Run handlers - meta: flush_handlers +- meta: flush_handlers
diff --git a/roles/mbusd/tasks/configure.yml b/roles/mbusd/tasks/configure.yml @@ -7,7 +7,7 @@ mode: "0755" owner: root group: root - notify: "Restart hostapd" + notify: "Restart mbusd" when: - ansible_service_mgr == "systemd"
diff --git a/roles/mbusd/tasks/main.yml b/roles/mbusd/tasks/main.yml @@ -20,11 +20,9 @@ - services.mbusd.enable is defined - services.mbusd.enable is true -- name: Run handlers - meta: flush_handlers - - include: remove.yml when: - services.mbusd.enable is defined - services.mbusd.enable is false +- meta: flush_handlers
diff --git a/roles/nfsserver/tasks/main.yml b/roles/nfsserver/tasks/main.yml @@ -20,10 +20,9 @@ - services.nfsserver.enable is defined - services.nfsserver.enable is true -- name: Run handlers - meta: flush_handlers - - include: remove.yml when: - services.nfsserver.enable is defined - services.nfsserver.enable is false + +- meta: flush_handlers
diff --git a/roles/nginx/meta/main.yml b/roles/nginx/meta/main.yml @@ -1,4 +1,4 @@ --- dependencies: - - role: nftables-handler- \ No newline at end of file + - role: nftables-handler
diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml @@ -32,5 +32,4 @@ - services.nginx.enable is defined - services.nginx.enable is false -- name: Run handlers - meta: flush_handlers +- meta: flush_handlers
diff --git a/roles/oeffi-web/meta/main.yml b/roles/oeffi-web/meta/main.yml @@ -2,5 +2,3 @@ dependencies: - role: nginx - when: - - services.oeffi_web.nginx.enable is true
diff --git a/roles/oeffi-web/tasks/main.yml b/roles/oeffi-web/tasks/main.yml @@ -27,5 +27,4 @@ - services.oeffi_web.enable is defined - services.oeffi_web.enable is false -- name: Run handlers - meta: flush_handlers +- meta: flush_handlers
diff --git a/roles/oeffisearch/meta/main.yml b/roles/oeffisearch/meta/main.yml @@ -2,5 +2,3 @@ dependencies: - role: nginx - when: - - services.oeffisearch.nginx.enable is true
diff --git a/roles/oeffisearch/tasks/main.yml b/roles/oeffisearch/tasks/main.yml @@ -27,5 +27,4 @@ - services.oeffisearch.enable is defined - services.oeffisearch.enable is false -- name: Run handlers - meta: flush_handlers +- meta: flush_handlers
diff --git a/roles/openssh/meta/main.yml b/roles/openssh/meta/main.yml @@ -2,5 +2,3 @@ dependencies: - role: nftables-handler - when: - - network.nftables.enable is true
diff --git a/roles/openssh/tasks/main.yml b/roles/openssh/tasks/main.yml @@ -26,5 +26,4 @@ - services.openssh.enable is defined - services.openssh.enable is false -- name: Run handlers - meta: flush_handlers- \ No newline at end of file +- meta: flush_handlers
diff --git a/roles/pleroma/meta/main.yml b/roles/pleroma/meta/main.yml @@ -3,6 +3,3 @@ dependencies: - role: postgresql - role: nginx - when: - - services.pleroma.nginx.enable is true - - \ No newline at end of file
diff --git a/roles/pleroma/tasks/main.yml b/roles/pleroma/tasks/main.yml @@ -32,5 +32,4 @@ - services.pleroma.enable is defined - services.pleroma.enable is false -- name: Run handlers - meta: flush_handlers +- meta: flush_handlers