Stop handling X-Forwarded-For from old tile CDN

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

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index b7654f3e8c383a150f5f03b571f337ee4096ec7a..fc61a22368f6ede6a97fd9dbc2b36027a36f3c16 100644 (file)
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: mediawiki
+# Cookbook:: mediawiki

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2013, OpenStreetMap Foundation
+# Copyright:: 2013, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -17,14 +17,16 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "memcached"
+include_recipe "accounts"

 include_recipe "apache"
 include_recipe "apache"

-include_recipe "mysql"
+include_recipe "apt"

 include_recipe "git"
 include_recipe "git"

+include_recipe "memcached"
+include_recipe "mysql"
+include_recipe "php::fpm"

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

-  php

   php-cli
   php-curl
   php-gd
   php-cli
   php-curl
   php-gd


@@ -32,6 +34,9 @@ package %w[
   php-mbstring
   php-mysql
   php-xml
   php-mbstring
   php-mysql
   php-xml

+  php-zip
+  composer
+  unzip

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


@@ -62,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


@@ -82,16 +93,10 @@ service "parsoid" do
   subscribes :restart, "template[/etc/mediawiki/parsoid/config.yaml]"
 end
 
   subscribes :restart, "template[/etc/mediawiki/parsoid/config.yaml]"
 end
 

-php_version = if node[:lsb][:release].to_f >= 18.04
-                "7.2"
-              else
-                "7.0"
-              end
-
-apache_module "php#{php_version}"
-
-link "/etc/php/#{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"