Merge pull request #7520 from jjneely/a2enmod

apache2_module module fixes
pull/7639/merge
Michael DeHaan 10 years ago
commit 8810733c64

@ -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…
Cancel
Save