Make sure we use the correct gem and bundler for blogs

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

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index a27056dd99de23fbbe439d2c0b712296b7987af7..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 "git"
 include_recipe "memcached"
 include_recipe "mysql"

-include_recipe "php::apache-fpm"
+include_recipe "php::fpm"

 
 # Mediawiki Base Requirements
 package %w[
 
 # Mediawiki Base Requirements
 package %w[


@@ -36,6 +36,7 @@ package %w[
   php-xml
   php-zip
   composer
   php-xml
   php-zip
   composer

+  unzip

 ]
 
 # Mediawiki enhanced difference engine
 ]
 
 # Mediawiki enhanced difference engine


@@ -66,17 +67,23 @@ package %w[
 ]
 
 # Mediawiki packages for SyntaxHighight support
 ]
 
 # 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
 
 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"
   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
 end
 
 service "parsoid" do


@@ -86,8 +93,10 @@ service "parsoid" do
   subscribes :restart, "template[/etc/mediawiki/parsoid/config.yaml]"
 end
 
   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
 
   to "../../mods-available/wikidiff2.ini"
 end
 

+apache_module "proxy"
+apache_module "proxy_fcgi"

 apache_module "rewrite"
 apache_module "rewrite"