minifirewall: fix failed_when conditions on restart

CHANGELOG.md

@@ -44,6 +44,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 * postfix: Do not send mails through milters a second time after amavis (in packmail)
 * etc-git : Remount /usr in rw for git gc in in /usr/share/scripts/
 * etc-git: Make evocommit fully compatible with OpenBSD
+* minifirewall: fix `failed_when` condition on restart
 
 ### Removed
 

evobackup-client/handlers/main.yml

@@ -2,8 +2,9 @@
 - name: restart minifirewall
   command: /etc/init.d/minifirewall restart
   register: minifirewall_init_restart
-  failed_when: "'starting IPTables rules is now finish : OK' not in minifirewall_init_restart.stdout"
-  changed_when: "'starting IPTables rules is now finish : OK' in minifirewall_init_restart.stdout"
+  failed_when:
+    - "'starting IPTables rules is now finish : OK' not in minifirewall_init_restart.stdout"
+    - "'minifirewall started' not in minifirewall_init_restart.stdout"
 
 - name: 'created new jail'
   command: "bkctld restart {{ evolinux_hostname }}"

evomaintenance/handlers/main.yml

@@ -3,8 +3,9 @@
 - name: restart minifirewall
   command: /etc/init.d/minifirewall restart
   register: minifirewall_init_restart
-  failed_when: "'starting IPTables rules is now finish : OK' not in minifirewall_init_restart.stdout"
-  changed_when: "'starting IPTables rules is now finish : OK' in minifirewall_init_restart.stdout"
+  failed_when:
+    - "'starting IPTables rules is now finish : OK' not in minifirewall_init_restart.stdout"
+    - "'minifirewall started' not in minifirewall_init_restart.stdout"
 
 - name: restart minifirewall (noop)
   meta: noop

minifirewall/tasks/config.yml

@@ -285,7 +285,7 @@
 - name: restart minifirewall
   command: /etc/init.d/minifirewall restart
   register: minifirewall_init_restart
-  failed_when: "'starting IPTables rules is now finish : OK' not in minifirewall_init_restart.stdout"
+  failed_when: "'minifirewall failed' in minifirewall_init_restart.stdout"
   when:
     - minifirewall_restart_if_needed | bool
     - minifirewall_is_running.rc == 0

minifirewall/tasks/main.yml

@@ -95,7 +95,6 @@
   command: /etc/init.d/minifirewall restart
   register: minifirewall_init_restart
   failed_when: "'minifirewall failed' in minifirewall_init_restart.stdout"
-  changed_when: "'minifirewall started' in minifirewall_init_restart.stdout"
   when:
     - minifirewall_install_mode != 'legacy'
     - minifirewall_restart_force | bool
@@ -104,7 +103,6 @@
   command: /etc/init.d/minifirewall restart
   register: minifirewall_init_restart
   failed_when: "'starting IPTables rules is now finish : OK' not in minifirewall_init_restart.stdout"
-  changed_when: "'starting IPTables rules is now finish : OK' in minifirewall_init_restart.stdout"
   when:
     - minifirewall_install_mode == 'legacy'
     - minifirewall_restart_force | bool

minifirewall/tasks/tail.yml

@@ -21,8 +21,7 @@
 - name: restart minifirewall
   command: /etc/init.d/minifirewall restart
   register: minifirewall_init_restart
-  failed_when: "'starting IPTables rules is now finish : OK' not in minifirewall_init_restart.stdout"
-  changed_when: "'starting IPTables rules is now finish : OK' in minifirewall_init_restart.stdout"
+  failed_when: "'minifirewall failed' in minifirewall_init_restart.stdout"
   when:
     - minifirewall_tail_template is changed
     - minifirewall_restart_if_needed | bool