X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/d054b1902c58aeda444f9c574e46c7638a65544e..94e8307dd58105891f5af81c06b3d8336deb75cb:/cookbooks/mediawiki/recipes/default.rb

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index 9e9d7e75b..b31db999d 100644
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -54,8 +54,16 @@ package "parsoid"
 # Mediawiki packages for SyntaxHighight support
 package "python-pygments"
 
-template "/etc/mediawiki/parsoid/settings.js" do
-  source "parsoid-settings.js.erb"
+file "/usr/lib/parsoid/lib" do
+  action :delete
+end
+
+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
@@ -64,7 +72,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"