Fix new foodcritic warnings

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

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index 2ecaaa4ebe5f30dacc53ea8f4304b4694bfbe0a7..9dedef7cf50ffa4bcc2eeba9d359280ed0dc8720 100644 (file)
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -51,8 +51,15 @@ package "liblz4-tool"
 package "curl"
 package "parsoid"
 
 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
   owner "root"
   group "root"
   mode 0o644


@@ -61,7 +68,8 @@ end
 service "parsoid" do
   action [:enable]
   supports :status => false, :restart => true, :reload => false
 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"
 end
 
 apache_module "php7.0"