Re-enable wikdiff2

[chef.git] / cookbooks / mediawiki / recipes / default.rb

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index 2e9ccd1b41b3d5563445067c21fc1a3b00b28ad0..2ecaaa4ebe5f30dacc53ea8f4304b4694bfbe0a7 100644 (file)
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -23,22 +23,14 @@ include_recipe "mysql"
 include_recipe "git"
 
 # Mediawiki Base Requirements
-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
+package "php"
+package "php-cli"
+package "php-curl"
+package "php-gd"
+package "php-intl"
+package "php-mbstring"
+package "php-mysql"
+package "php-xml"
 
 # Mediawiki enhanced difference engine
 package "php-wikidiff2"
@@ -72,18 +64,10 @@ service "parsoid" do
   subscribes :restart, "template[/etc/mediawiki/parsoid/settings.js]"
 end
 
-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 "php7.0"
 
-  apache_module "php5"
+link "/etc/php/7.0/apache2/conf.d/20-wikidiff2.ini" do
+  to "../../mods-available/wikidiff2.ini"
 end
 
 apache_module "rewrite"