From: Tom Hughes <tom@compton.nu>
Date: Tue, 14 Feb 2017 12:33:55 +0000 (+0000)
Subject: Update mediawiki cookbook for Ubuntu 16.04
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/45305f4f316908dfaa582d5d588a5bda4eba04eb?ds=sidebyside

Update mediawiki cookbook for Ubuntu 16.04
---

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index 9b97eacac..8e7d01bfa 100644
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -23,15 +23,24 @@ include_recipe "mysql"
 include_recipe "git"
 
 # Mediawiki Base Requirements
-package "php5"
-package "php5-cli"
-package "php5-curl"
-package "php5-mysql"
-package "php5-gd"
-package "php-apc"
-package "php5-intl"
-package "libapache2-mod-php5"
+if node[:lsb][:release].to_f >= 16.04
+  package "php"
+  package "php-cli"
+  package "php-curl"
+  package "php-mysql"
+  package "php-gd"
+  package "php-intl"
+else
+  package "php5"
+  package "php5-cli"
+  package "php5-curl"
+  package "php5-mysql"
+  package "php5-gd"
+  package "php-apc"
+  package "php5-intl"
+end
 
+# Mediawiki enhanced difference engine
 package "php-wikidiff2"
 
 # Mediawiki Image + SVG support
@@ -63,9 +72,18 @@ service "parsoid" do
   subscribes :restart, "template[/etc/mediawiki/parsoid/settings.js]"
 end
 
-link "/etc/php5/apache2/conf.d/20-wikidiff2.ini" do
-  to "../../mods-available/wikidiff2.ini"
+if node[:lsb][:release].to_f >= 16.04
+  link "/etc/php/7.0/apache2/conf.d/20-wikidiff2.ini" do
+    to "../../mods-available/wikidiff2.ini"
+  end
+
+  apache_module "php7.0"
+else
+  link "/etc/php5/apache2/conf.d/20-wikidiff2.ini" do
+    to "../../mods-available/wikidiff2.ini"
+  end
+
+  apache_module "php5"
 end
 
-apache_module "php5"
 apache_module "rewrite"