Merge remote-tracking branch 'github/pull/527'

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

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index 5bc5b6ac169a9165666cc634503a5aa0f37d525f..0d15cdef4dd36241a4d95995241d43d91613cae7 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
 #
-# 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
 #
-#     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,
@@ -17,37 +17,64 @@
 # limitations under the License.
 #
 
+include_recipe "accounts"
+include_recipe "apache"
+include_recipe "apt"
+include_recipe "git"
 include_recipe "memcached"
-include_recipe "apache::ssl"
 include_recipe "mysql"
-include_recipe "git"
+include_recipe "php::fpm"
 
-#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"
+# Mediawiki Base Requirements
+package %w[
+  php-apcu
+  php-cli
+  php-curl
+  php-gd
+  php-igbinary
+  php-intl
+  php-memcache
+  php-mbstring
+  php-mysql
+  php-xml
+  php-zip
+  composer
+  unzip
+]
 
+# Mediawiki enhanced difference engine
 package "php-wikidiff2"
 
-#Mediawiki Image + SVG support
-package "imagemagick"
-package "librsvg2-bin"
+# Mediawiki Image + SVG support
+package %w[
+  imagemagick
+  librsvg2-bin
+]
+
+# Mediawiki PDF support via Extension:PdfHandler
+package %w[
+  ghostscript
+  poppler-utils
+]
+
+# Mediawiki backup
+package %w[
+  xz-utils
+  liblz4-tool
+]
 
-#Mediawiki PDF support via Extension:PdfHandler
-package "ghostscript"
-package "poppler-utils"
+# Mediawiki packages for VisualEditor support
+package %w[
+  curl
+]
 
-#Mediawiki backup
-package "xz-utils"
+# Mediawiki packages for SyntaxHighight support
+package "python3-pygments"
 
-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
 
-apache_module "php5"
+apache_module "proxy"
+apache_module "proxy_fcgi"
 apache_module "rewrite"