wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make second group match of ufw status output optional (#56678)

Browse source 
* Make second group match of ufw status output optional

Fixes #56674

* Fix comparison logic.

* Add changelog fragment
This commit is contained in:
Tyler Hartley 2019-05-28 11:54:11 -07:00 committed by Felix Fontein
parent 86928a5f74
commit 1d22909f7c
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/56678-ufw-status-change-detection.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- ufw - correctly check status when logging is off (https://github.com/ansible/ansible/issues/56674)

6
lib/ansible/modules/system/ufw.py
View file

@ -445,12 +445,14 @@ def main():
execute(cmd + [['-f'], [states[value]]])
elif command == 'logging':
extract = re.search(r'Logging: (on|off) \(([a-z]+)\)', pre_state)
extract = re.search(r'Logging: (on|off)(?: \(([a-z]+)\))?', pre_state)
if extract:
current_level = extract.group(2)
current_on_off_value = extract.group(1)
if value != "off":
if value != "on" and (value != current_level or current_on_off_value == "off"):
if current_on_off_value == "off":
changed = True
elif value != "on" and value != current_level:
changed = True
elif current_on_off_value != "off":
changed = True