diff options
| author | Jack Neely <jjneely@42lines.net> | 2014-05-23 11:26:59 -0400 |
|---|---|---|
| committer | Jack Neely <jjneely@42lines.net> | 2014-05-23 12:47:57 -0400 |
| commit | 1452a058dfb86834dda631a737a93543ad15c1e3 (patch) | |
| tree | b06e04a93b6e4d20a5cb2e7c7d892fedfeaa4e64 /web_infrastructure | |
| parent | 14ee2e4505a97cfd42138308277893e8d49108aa (diff) | |
| download | ansible-modules-core-1452a058dfb86834dda631a737a93543ad15c1e3.tar.gz | |
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.
Diffstat (limited to 'web_infrastructure')
| -rw-r--r-- | web_infrastructure/apache2_module | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web_infrastructure/apache2_module b/web_infrastructure/apache2_module index 103a1537..d966fad5 100644 --- a/web_infrastructure/apache2_module +++ b/web_infrastructure/apache2_module @@ -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.search(r'.*%s\s+already enabled.*' % name, stdout, re.M): module.exit_json(changed = False, result = "Success") elif result != 0: module.fail_json(msg="Failed to enable module %s: %s" % (name, stdout)) |