diff options
author | James Cammarata <jimi@sngx.net> | 2014-08-08 19:30:04 -0500 |
---|---|---|
committer | James Cammarata <jimi@sngx.net> | 2014-08-08 19:30:04 -0500 |
commit | ba062de7448166682ace0bc1a340ebc536e1f37e (patch) | |
tree | 18a7809361fcf0034b8052e6bde0ae2a8e5ac26b /web_infrastructure | |
parent | 32acd276b6fe2a45c80458f0ed011a462747ae05 (diff) | |
parent | c0543db5f3290544fae6df0cc53712f4ca4a28e5 (diff) | |
download | ansible-modules-core-ba062de7448166682ace0bc1a340ebc536e1f37e.tar.gz |
Merge branch '7736' of https://github.com/kcghost/ansible into kcghost-7736
Diffstat (limited to 'web_infrastructure')
-rw-r--r-- | web_infrastructure/apache2_module | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web_infrastructure/apache2_module b/web_infrastructure/apache2_module index d966fad5..39351482 100644 --- a/web_infrastructure/apache2_module +++ b/web_infrastructure/apache2_module @@ -51,7 +51,7 @@ def _disable_module(module): a2dismod_binary = module.get_bin_path("a2dismod") result, stdout, stderr = module.run_command("%s %s" % (a2dismod_binary, name)) - if re.match(r'.*already disabled.*', stdout): + if re.match(r'.*' + name + r' already disabled.*', stdout, re.S): module.exit_json(changed = False, result = "Success") elif result != 0: module.fail_json(msg="Failed to disable module %s: %s" % (name, stdout)) @@ -63,7 +63,7 @@ def _enable_module(module): a2enmod_binary = module.get_bin_path("a2enmod") result, stdout, stderr = module.run_command("%s %s" % (a2enmod_binary, name)) - if re.search(r'.*%s\s+already enabled.*' % name, stdout, re.M): + if re.match(r'.*' + name + r' already enabled.*', stdout, re.S): module.exit_json(changed = False, result = "Success") elif result != 0: module.fail_json(msg="Failed to enable module %s: %s" % (name, stdout)) |