Merge remote-tracking branch 'tigerfell/pr257'

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

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index a27056dd99de23fbbe439d2c0b712296b7987af7..fc511a981531399f4e5151e7ef7be4a5244808ba 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-fpm"
+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
@@ -62,32 +63,15 @@ package %w[
 # Mediawiki packages for VisualEditor support
 package %w[
   curl
-  parsoid
 ]
 
 # 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
-  source "parsoid-config.yaml.erb"
-  owner "root"
-  group "root"
-  mode 0o644
-end
-
-service "parsoid" do
-  action [:enable]
-  supports :status => false, :restart => true, :reload => false
-  subscribes :restart, "file[/etc/mediawiki/parsoid/settings.js]"
-  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
 
+apache_module "proxy"
+apache_module "proxy_fcgi"
 apache_module "rewrite"