X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/73538b13c12b4cc807a072ea59c0f187968d16d3..75c5da85dcd5a6b5b66040dfd838c2bbf30ba4d5:/cookbooks/mediawiki/recipes/default.rb

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index b9c878601..9dedef7cf 100644
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -26,9 +26,11 @@ include_recipe "git"
 package "php"
 package "php-cli"
 package "php-curl"
-package "php-mysql"
 package "php-gd"
 package "php-intl"
+package "php-mbstring"
+package "php-mysql"
+package "php-xml"
 
 # Mediawiki enhanced difference engine
 package "php-wikidiff2"
@@ -49,8 +51,15 @@ package "liblz4-tool"
 package "curl"
 package "parsoid"
 
-template "/etc/mediawiki/parsoid/settings.js" do
-  source "parsoid-settings.js.erb"
+# Mediawiki packages for SyntaxHighight support
+package "python-pygments"
+
+file "/etc/mediawiki/parsoid/settings.js" do
+  action :delete
+end
+
+template "/etc/mediawiki/parsoid/config.yaml" do
+  source "parsoid-config.yaml.erb"
   owner "root"
   group "root"
   mode 0o644
@@ -59,7 +68,8 @@ end
 service "parsoid" do
   action [:enable]
   supports :status => false, :restart => true, :reload => false
-  subscribes :restart, "template[/etc/mediawiki/parsoid/settings.js]"
+  subscribes :restart, "file[/etc/mediawiki/parsoid/settings.js]"
+  subscribes :restart, "template[/etc/mediawiki/parsoid/config.yaml]"
 end
 
 apache_module "php7.0"