]> git.openstreetmap.org Git - chef.git/commitdiff
Use PHP 7.2 for mediawiki on Ubuntu 18.04
authorTom Hughes <tom@compton.nu>
Mon, 25 Jun 2018 11:22:02 +0000 (12:22 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 25 Jun 2018 11:22:27 +0000 (12:22 +0100)
cookbooks/mediawiki/recipes/default.rb

index 63c9d53db500f643ba2f73dadd627975f0549b87..b7654f3e8c383a150f5f03b571f337ee4096ec7a 100644 (file)
@@ -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