X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/4a27f30450a0757be588b16b7e69707f830de804..df246797e4b8705a0912158c7aa46e4da3138e01:/cookbooks/mediawiki/recipes/default.rb?ds=inline

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index a27056dd9..77f956b69 100644
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -23,7 +23,7 @@ include_recipe "apt"
 include_recipe "git"
 include_recipe "memcached"
 include_recipe "mysql"
-include_recipe "php::apache-fpm"
+include_recipe "php::fpm"
 
 # Mediawiki Base Requirements
 package %w[
@@ -73,10 +73,16 @@ file "/etc/mediawiki/parsoid/settings.js" do
 end
 
 template "/etc/mediawiki/parsoid/config.yaml" do
+  action :nothing
   source "parsoid-config.yaml.erb"
   owner "root"
   group "root"
-  mode 0o644
+  mode "644"
+end
+
+notify_group "parsoid-config" do
+  action :run
+  notifies :create, "template[/etc/mediawiki/parsoid/config.yaml]"
 end
 
 service "parsoid" do
@@ -86,7 +92,7 @@ service "parsoid" do
   subscribes :restart, "template[/etc/mediawiki/parsoid/config.yaml]"
 end
 
-link "/etc/php/#{node[:php][:version]}/apache2/conf.d/20-wikidiff2.ini" do
+link "/etc/php/#{node[:php][:version]}/fpm/conf.d/20-wikidiff2.ini" do
   to "../../mods-available/wikidiff2.ini"
 end