From: Tom Hughes <tom@compton.nu>
Date: Thu, 28 Jun 2018 09:54:41 +0000 (+0100)
Subject: Use PHP 7.2 for mediawiki everywhere
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/5c64c57e2357a3c48a06d3bcc378de3238d59128?ds=sidebyside

Use PHP 7.2 for mediawiki everywhere
---

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index b7654f3e8..43be0bb9a 100644
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -82,15 +82,9 @@ service "parsoid" do
   subscribes :restart, "template[/etc/mediawiki/parsoid/config.yaml]"
 end
 
-php_version = if node[:lsb][:release].to_f >= 18.04
-                "7.2"
-              else
-                "7.0"
-              end
+apache_module "php7.2"
 
-apache_module "php#{php_version}"
-
-link "/etc/php/#{php_version}/apache2/conf.d/20-wikidiff2.ini" do
+link "/etc/php/7.2/apache2/conf.d/20-wikidiff2.ini" do
   to "../../mods-available/wikidiff2.ini"
 end