From 30ed23bf1c9b555c84ecf0547c11bbfdde8e3879 Mon Sep 17 00:00:00 2001 From: Rowan Wookey Date: Thu, 8 Sep 2016 12:58:11 +0100 Subject: Added work around for Ubuntu Xenial calling php7_module php7.0 --- web_infrastructure/apache2_module.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'web_infrastructure') 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)) -- cgit v1.2.1