mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
apache2_module: Handle dep resolution
The apache2_module module did not properly handle when a2enmod would handle apache module dependancies. It would always return a state of changed. I've updated the regular expression to properly parse that output as well as the normal output. A good example of this is the mod_proxy_http module.
This commit is contained in:
parent
3531d3cd28
commit
7883261335
1 changed files with 1 additions and 1 deletions
|
@ -63,7 +63,7 @@ def _enable_module(module):
|
||||||
a2enmod_binary = module.get_bin_path("a2enmod")
|
a2enmod_binary = module.get_bin_path("a2enmod")
|
||||||
result, stdout, stderr = module.run_command("%s %s" % (a2enmod_binary, name))
|
result, stdout, stderr = module.run_command("%s %s" % (a2enmod_binary, name))
|
||||||
|
|
||||||
if re.match(r'.*already enabled.*', stdout):
|
if re.search(r'.*%s\s+already enabled.*' % name, stdout, re.M):
|
||||||
module.exit_json(changed = False, result = "Success")
|
module.exit_json(changed = False, result = "Success")
|
||||||
elif result != 0:
|
elif result != 0:
|
||||||
module.fail_json(msg="Failed to enable module %s: %s" % (name, stdout))
|
module.fail_json(msg="Failed to enable module %s: %s" % (name, stdout))
|
||||||
|
|
Loading…
Reference in a new issue