summaryrefslogtreecommitdiff
path: root/web_infrastructure
diff options
context:
space:
mode:
authorRowan Wookey <admin@rwky.net>2016-09-08 12:58:11 +0100
committerMichael Scherer <mscherer@users.noreply.github.com>2016-10-23 02:59:55 +0200
commit30ed23bf1c9b555c84ecf0547c11bbfdde8e3879 (patch)
treebf2e8c30b29fbf86aba4c29a8d9fec3c5c6e3a21 /web_infrastructure
parent9c766a9f88b88d526e5f32ffdb0af860e16b1dda (diff)
downloadansible-modules-core-30ed23bf1c9b555c84ecf0547c11bbfdde8e3879.tar.gz
Added work around for Ubuntu Xenial calling php7_module php7.0
Diffstat (limited to 'web_infrastructure')
-rw-r--r--web_infrastructure/apache2_module.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/web_infrastructure/apache2_module.py b/web_infrastructure/apache2_module.py
index 16a99988..9f9df923 100644
--- a/web_infrastructure/apache2_module.py
+++ b/web_infrastructure/apache2_module.py
@@ -80,6 +80,12 @@ def _module_is_enabled(module):
result, stdout, stderr = module.run_command("%s -M" % control_binary)
+ """
+ Work around for Ubuntu Xenial listing php7_module as php7.0
+ """
+ if name == "php7.0":
+ name = "php7"
+
if result != 0:
module.fail_json(msg="Error executing %s: %s" % (control_binary, stderr))