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 cadefe60c48efc250b98d3f959bb86aed616da74..fc61a22368f6ede6a97fd9dbc2b36027a36f3c16 100644 (file)
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# 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.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,41 +17,86 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "accounts"
+include_recipe "apache"
+include_recipe "apt"
+include_recipe "git"

 include_recipe "memcached"
 include_recipe "memcached"

-include_recipe "apache::ssl"

 include_recipe "mysql"
 include_recipe "mysql"

-include_recipe "git"
+include_recipe "php::fpm"

 
 # Mediawiki Base Requirements
 
 # Mediawiki Base Requirements

-package "php5"
-package "php5-cli"
-package "php5-curl"
-package "php5-mysql"
-package "php5-gd"
-package "php-apc"
-package "php5-intl"
-package "libapache2-mod-php5"
+package %w[
+  php-cli
+  php-curl
+  php-gd
+  php-intl
+  php-mbstring
+  php-mysql
+  php-xml
+  php-zip
+  composer
+  unzip
+]

 
 

+# Mediawiki enhanced difference engine

 package "php-wikidiff2"
 
 # Mediawiki Image + SVG support
 package "php-wikidiff2"
 
 # Mediawiki Image + SVG support

-package "imagemagick"
-package "librsvg2-bin"
+package %w[
+  imagemagick
+  librsvg2-bin
+]

 
 # Mediawiki PDF support via Extension:PdfHandler
 
 # Mediawiki PDF support via Extension:PdfHandler

-package "ghostscript"
-package "poppler-utils"
+package %w[
+  ghostscript
+  poppler-utils
+]

 
 # Mediawiki backup
 
 # Mediawiki backup

-package "xz-utils"
+package %w[
+  xz-utils
+  liblz4-tool
+]

 
 # Mediawiki packages for VisualEditor support
 
 # Mediawiki packages for VisualEditor support

-package "curl"
-package "parsoid"
+package %w[
+  curl
+  parsoid
+]
+
+# Mediawiki packages for SyntaxHighight support
+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
+  subscribes :restart, "file[/etc/mediawiki/parsoid/settings.js]"
+  subscribes :restart, "template[/etc/mediawiki/parsoid/config.yaml]"
+end

 
 

-link "/etc/php5/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 "php5"
+apache_module "proxy"
+apache_module "proxy_fcgi"

 apache_module "rewrite"
 apache_module "rewrite"