move spam regex to an abuse filter

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

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index 08e7d73d0e6bd30e02e1efbec812cf22d662dd0c..fc61a22368f6ede6a97fd9dbc2b36027a36f3c16 100644 (file)
--- 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"
+include_recipe "php::fpm"
 
 # Mediawiki Base Requirements
 package %w[
@@ -36,6 +36,7 @@ package %w[
   php-xml
   php-zip
   composer
+  unzip
 ]
 
 # Mediawiki enhanced difference engine
@@ -66,19 +67,25 @@ package %w[
 ]
 
 # Mediawiki packages for SyntaxHighight support
-package "python-pygments"
+package "python3-pygments"
 
 file "/etc/mediawiki/parsoid/settings.js" do
   action :delete
 end
 
 template "/etc/mediawiki/parsoid/config.yaml" do
+  action :nothing
   source "parsoid-config.yaml.erb"
   owner "root"
   group "root"
   mode "644"
 end
 
+notify_group "parsoid-config" do
+  action :run
+  notifies :create, "template[/etc/mediawiki/parsoid/config.yaml]"
+end
+
 service "parsoid" do
   action [:enable]
   supports :status => false, :restart => true, :reload => false
@@ -90,4 +97,6 @@ link "/etc/php/#{node[:php][:version]}/fpm/conf.d/20-wikidiff2.ini" do
   to "../../mods-available/wikidiff2.ini"
 end
 
+apache_module "proxy"
+apache_module "proxy_fcgi"
 apache_module "rewrite"