mediawiki: remove unneeded parsoid code

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

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index 20b5f6f3e4df619745cf606e4883bf388539e77a..9dedef7cf50ffa4bcc2eeba9d359280ed0dc8720 100644 (file)
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -54,15 +54,12 @@ 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") }
+file "/etc/mediawiki/parsoid/settings.js" do
+  action :delete
 end
 
-template "/etc/mediawiki/parsoid/settings.js" do
-  source "parsoid-settings.js.erb"
+template "/etc/mediawiki/parsoid/config.yaml" do
+  source "parsoid-config.yaml.erb"
   owner "root"
   group "root"
   mode 0o644
@@ -71,8 +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, "link[/usr/lib/parsoid/lib]"
+  subscribes :restart, "file[/etc/mediawiki/parsoid/settings.js]"
+  subscribes :restart, "template[/etc/mediawiki/parsoid/config.yaml]"
 end
 
 apache_module "php7.0"