X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/93c098cdc4f22b1fe69ecd88b3ac2d2b211780ff..844e91eceb459019a4d5304d9d803ae67daed0ad:/cookbooks/mediawiki/recipes/default.rb

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index b7654f3e8..4466250b9 100644
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# 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.
@@ -17,10 +17,12 @@
 # limitations under the License.
 #
 
-include_recipe "memcached"
+include_recipe "accounts"
 include_recipe "apache"
-include_recipe "mysql"
+include_recipe "apt"
 include_recipe "git"
+include_recipe "memcached"
+include_recipe "mysql"
 
 # Mediawiki Base Requirements
 package %w[
@@ -32,6 +34,8 @@ package %w[
   php-mbstring
   php-mysql
   php-xml
+  php-zip
+  composer
 ]
 
 # Mediawiki enhanced difference engine
@@ -82,15 +86,9 @@ service "parsoid" do
   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}"
+apache_module "php7.2"
 
-link "/etc/php/#{php_version}/apache2/conf.d/20-wikidiff2.ini" do
+link "/etc/php/7.2/apache2/conf.d/20-wikidiff2.ini" do
   to "../../mods-available/wikidiff2.ini"
 end