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

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

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index b7654f3e8c383a150f5f03b571f337ee4096ec7a..daa2f7dc8d212f30c4f88c2209c157fd31100635 100644 (file)
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -32,6 +32,7 @@ package %w[
   php-mbstring
   php-mysql
   php-xml
+  composer
 ]
 
 # Mediawiki enhanced difference engine
@@ -82,15 +83,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 "php7.2"
 
-apache_module "php#{php_version}"
-
-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