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