X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/dd049724ae357550840e0460de1074960d203c27..07417174dc9d0271283aacbe20b1cd73ec374685:/cookbooks/mediawiki/recipes/default.rb diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb index 4466250b9..2977b5c42 100644 --- a/cookbooks/mediawiki/recipes/default.rb +++ b/cookbooks/mediawiki/recipes/default.rb @@ -23,10 +23,10 @@ include_recipe "apt" include_recipe "git" include_recipe "memcached" include_recipe "mysql" +include_recipe "php::apache-fpm" # Mediawiki Base Requirements package %w[ - php php-cli php-curl php-gd @@ -86,9 +86,7 @@ service "parsoid" do subscribes :restart, "template[/etc/mediawiki/parsoid/config.yaml]" end -apache_module "php7.2" - -link "/etc/php/7.2/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