4 files changed, 9 insertions, 20 deletions
diff --git a/roles/apt/handlers/main.yml b/roles/apt/handlers/main.yml
index 625a8af..81438db 100644
--- a/roles/apt/handlers/main.yml
+++ b/roles/apt/handlers/main.yml
@@ -1,16 +1,5 @@
 - name: Reboot
+  become: true
   ansible.builtin.reboot:
-  args:
     # 3 minutes is plenty.
     reboot_timeout: 180
-  # Don't reboot yourself accidentally:
-  when: 'ansible_env["SSH_CLIENT"].split()[0] not in ansible_all_ipv4_addresses'
-  become: true
-  listen: reboot
-
-- name: Wait for connectivity
-  ansible.builtin.wait_for_connection:
-  args:
-    # 3 minutes is plenty.
-    timeout: 180
-  listen: reboot
diff --git a/roles/apt/tasks/main.yml b/roles/apt/tasks/main.yml
index 63f3ed7..1d07a7f 100644
--- a/roles/apt/tasks/main.yml
+++ b/roles/apt/tasks/main.yml
@@ -4,7 +4,7 @@
     install_recommends: false
     update_cache: true
     upgrade: dist
-  notify: reboot
+  notify: Reboot
 
 - name: Reboot if necessary
   ansible.builtin.meta: flush_handlers
@@ -14,7 +14,7 @@
   ansible.builtin.apt:
     autoremove: true
     purge: true
-  notify: reboot
+  notify: Reboot
 
 - name: Reboot if necessary
   ansible.builtin.meta: flush_handlers
diff --git a/roles/firewall/handlers/main.yml b/roles/firewall/handlers/main.yml
index 70387f3..81438db 100644
--- a/roles/firewall/handlers/main.yml
+++ b/roles/firewall/handlers/main.yml
@@ -1,5 +1,5 @@
-- name: Reload iptables
+- name: Reboot
   become: true
-  ansible.builtin.systemd_service:
-    name: netfilter-persistent
-    state: restarted
+  ansible.builtin.reboot:
+    # 3 minutes is plenty.
+    reboot_timeout: 180
diff --git a/roles/firewall/tasks/main.yml b/roles/firewall/tasks/main.yml
index 9fcf543..345f6a6 100644
--- a/roles/firewall/tasks/main.yml
+++ b/roles/firewall/tasks/main.yml
@@ -16,7 +16,7 @@
   loop:
     - {src: rules.v4, dest: /etc/iptables/rules.v4}
     - {src: rules.v6, dest: /etc/iptables/rules.v6}
-  notify: Reload iptables
+  notify: Reboot
 
-- name: Flush handlers
+- name: Reboot if necessary
   ansible.builtin.meta: flush_handlers