X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/45305f4f316908dfaa582d5d588a5bda4eba04eb..9bfced4fea980fe50922123c1aef2aa84dafefec:/cookbooks/mediawiki/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index 8e7d01bfa..20b5f6f3e 100644
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -18,27 +18,19 @@
 #
 
 include_recipe "memcached"
-include_recipe "apache::ssl"
+include_recipe "apache"
 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"
@@ -59,6 +51,16 @@ package "liblz4-tool"
 package "curl"
 package "parsoid"
 
+# Mediawiki packages for SyntaxHighight support
+package "python-pygments"
+
+# parsoid 0.6.1all is broken with Ubuntu 16.04+ version of node. Monkey patch a fix.
+link "/usr/lib/parsoid/lib" do
+  to "/usr/lib/parsoid/src/lib"
+  link_type :symbolic
+  not_if { File.exist?("/usr/lib/parsoid/lib") }
+end
+
 template "/etc/mediawiki/parsoid/settings.js" do
   source "parsoid-settings.js.erb"
   owner "root"
@@ -70,20 +72,13 @@ service "parsoid" do
   action [:enable]
   supports :status => false, :restart => true, :reload => false
   subscribes :restart, "template[/etc/mediawiki/parsoid/settings.js]"
+  subscribes :restart, "link[/usr/lib/parsoid/lib]"
 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"