From f2fa56b485bab467250185c0dd3ee6b777ee0044 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Wed, 25 Aug 2021 06:36:19 +0200 Subject: [PATCH] Fix apache2_module a2enmod/a2dismod detection and error message if not found. (#3258) --- changelogs/fragments/3258-apache2_module.yml | 2 ++ plugins/modules/web_infrastructure/apache2_module.py | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 changelogs/fragments/3258-apache2_module.yml diff --git a/changelogs/fragments/3258-apache2_module.yml b/changelogs/fragments/3258-apache2_module.yml new file mode 100644 index 0000000000..a60f2125a4 --- /dev/null +++ b/changelogs/fragments/3258-apache2_module.yml @@ -0,0 +1,2 @@ +bugfixes: +- "apache2_module - fix ``a2enmod``/``a2dismod`` detection, and error message when not found (https://github.com/ansible-collections/community.general/issues/3253)." diff --git a/plugins/modules/web_infrastructure/apache2_module.py b/plugins/modules/web_infrastructure/apache2_module.py index c75dc1c30c..44327fe13c 100644 --- a/plugins/modules/web_infrastructure/apache2_module.py +++ b/plugins/modules/web_infrastructure/apache2_module.py @@ -202,15 +202,17 @@ def _set_state(module, state): result=success_msg, warnings=module.warnings) - a2mod_binary = [module.get_bin_path(a2mod_binary)] - if a2mod_binary is None: + a2mod_binary_path = module.get_bin_path(a2mod_binary) + if a2mod_binary_path is None: module.fail_json(msg="%s not found. Perhaps this system does not use %s to manage apache" % (a2mod_binary, a2mod_binary)) + a2mod_binary_cmd = [a2mod_binary_path] + if not want_enabled and force: # force exists only for a2dismod on debian - a2mod_binary.append('-f') + a2mod_binary_cmd.append('-f') - result, stdout, stderr = module.run_command(a2mod_binary + [name]) + result, stdout, stderr = module.run_command(a2mod_binary_cmd + [name]) if _module_is_enabled(module) == want_enabled: module.exit_json(changed=True,