diff options
| author | Casey Fitzpatrick <kcghost@gmail.com> | 2014-06-24 20:37:37 -0400 |
|---|---|---|
| committer | Casey Fitzpatrick <kcghost@gmail.com> | 2014-06-24 20:37:49 -0400 |
| commit | c0543db5f3290544fae6df0cc53712f4ca4a28e5 (patch) | |
| tree | 4f53bfcf6601672d24fc2cae5e5800b2131f01b8 /web_infrastructure | |
| parent | c61d04dd1f8ff2f535e44c2cd0b3f8fadce4ba9b (diff) | |
| download | ansible-modules-core-c0543db5f3290544fae6df0cc53712f4ca4a28e5.tar.gz | |
apache2_module handles multiple lines of output, fixes #7736 and #7857
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 7b71a23c..cc8da4ac 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.match(r'.*already enabled.*', stdout): + 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)) |