From 573da82d342b0197451448a59a239dfd8908d359 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 10 Aug 2018 13:21:19 +0100 Subject: [PATCH] Use PHP 7.2 for Nominatim on 18.04 --- cookbooks/nominatim/recipes/default.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb index 128bb34cf..f424061af 100644 --- a/cookbooks/nominatim/recipes/default.rb +++ b/cookbooks/nominatim/recipes/default.rb @@ -327,19 +327,25 @@ apache_module "proxy_fcgi" apache_module "proxy_http" apache_module "headers" -service "php7.0-fpm" do +php_version = if node[:lsb][:release].to_f >= 18.04 + "7.2" + else + "7.0" + end + +service "php#{php_version}-fpm" do action [:enable, :start] supports :status => true, :restart => true, :reload => true end node[:nominatim][:fpm_pools].each do |name, data| - template "/etc/php/7.0/fpm/pool.d/#{name}.conf" do + template "/etc/php/#{php_version}/fpm/pool.d/#{name}.conf" do source "fpm.conf.erb" owner "root" group "root" mode 0o644 variables data.merge(:name => name) - notifies :reload, "service[php7.0-fpm]" + notifies :reload, "service[php#{php_version}-fpm]" end end -- 2.43.2