From a3465aba419f0b014056c0a3864364e0b43e6eaa Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 25 Jun 2018 12:22:02 +0100 Subject: [PATCH 1/1] Use PHP 7.2 for mediawiki on Ubuntu 18.04 --- cookbooks/mediawiki/recipes/default.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb index 63c9d53db..b7654f3e8 100644 --- a/cookbooks/mediawiki/recipes/default.rb +++ b/cookbooks/mediawiki/recipes/default.rb @@ -82,9 +82,15 @@ service "parsoid" do subscribes :restart, "template[/etc/mediawiki/parsoid/config.yaml]" end -apache_module "php7.0" +php_version = if node[:lsb][:release].to_f >= 18.04 + "7.2" + else + "7.0" + end -link "/etc/php/7.0/apache2/conf.d/20-wikidiff2.ini" do +apache_module "php#{php_version}" + +link "/etc/php/#{php_version}/apache2/conf.d/20-wikidiff2.ini" do to "../../mods-available/wikidiff2.ini" end -- 2.43.2