From: Tom Hughes <tom@compton.nu>
Date: Fri, 10 Aug 2018 12:21:19 +0000 (+0100)
Subject: Use PHP 7.2 for Nominatim on 18.04
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/573da82d342b0197451448a59a239dfd8908d359?hp=839bdebb46bc3ab0efae783ec9e5d5b0ffd5b386

Use PHP 7.2 for Nominatim on 18.04
---

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