X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/252f39e174aa5f88b1ddb5896e593fcc3818ed40..d4a74eb0ce478386a1f5cf927708d1f2a485e7dd:/cookbooks/mediawiki/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index 5bc5b6ac1..8e7d01bfa 100644
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -22,32 +22,68 @@ include_recipe "apache::ssl"
 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"
+# 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
 
+# Mediawiki enhanced difference engine
 package "php-wikidiff2"
 
-#Mediawiki Image + SVG support
+# Mediawiki Image + SVG support
 package "imagemagick"
 package "librsvg2-bin"
 
-#Mediawiki PDF support via Extension:PdfHandler
+# Mediawiki PDF support via Extension:PdfHandler
 package "ghostscript"
 package "poppler-utils"
 
-#Mediawiki backup
+# Mediawiki backup
 package "xz-utils"
+package "liblz4-tool"
+
+# Mediawiki packages for VisualEditor support
+package "curl"
+package "parsoid"
+
+template "/etc/mediawiki/parsoid/settings.js" do
+  source "parsoid-settings.js.erb"
+  owner "root"
+  group "root"
+  mode 0o644
+end
+
+service "parsoid" do
+  action [:enable]
+  supports :status => false, :restart => true, :reload => false
+  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
 
-link "/etc/php5/apache2/conf.d/20-wikidiff2.ini" do
-  to "../../mods-available/wikidiff2.ini"
+  apache_module "php5"
 end
 
-apache_module "php5"
 apache_module "rewrite"