X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/93c098cdc4f22b1fe69ecd88b3ac2d2b211780ff..2514acf0366bc0cdd14c51eb2e5b60e2569413f2:/cookbooks/mediawiki/recipes/default.rb diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb index b7654f3e8..daa2f7dc8 100644 --- 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