Remove Ubuntu 16.04 support for Nominatim

[chef.git] / cookbooks / nominatim / recipes / default.rb

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 66eda9587feff5707ebdc5d42eb5e15c9ff23d00..0d99a5cab374c8897efd62d1c27548f0a4cba5f8 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -53,9 +53,10 @@ end
 include_recipe "postgresql"
 
 postgresql_version = node[:nominatim][:dbcluster].split("/").first
+postgis_version = node[:nominatim][:postgis]
 
 package "postgis"
-package "postgresql-#{postgresql_version}-postgis-2.3"
+package "postgresql-#{postgresql_version}-postgis-#{postgis_version}"
 
 node[:nominatim][:dbadmins].each do |user|
   postgresql_user user do
@@ -135,6 +136,7 @@ end
 ## Nominatim backend
 
 include_recipe "git"
+include_recipe "python"
 
 package "build-essential"
 package "cmake"
@@ -149,7 +151,14 @@ package "libbz2-dev"
 package "libpq-dev"
 package "libgeos++-dev"
 package "libproj-dev"
-package "pyosmium"
+package "osmosis"
+
+if node[:lsb][:release].to_f >= 18.04
+  package "pyosmium"
+else
+  package "libboost-python-dev"
+  python_package "osmium"
+end
 
 source_directory = "#{basedir}/nominatim"
 build_directory = "#{basedir}/bin"
@@ -243,7 +252,7 @@ remote_file "#{source_directory}/data/country_osm_grid.sql.gz" do
 end
 
 template "/etc/cron.d/nominatim" do
-  action node[:nominatim][:state] == :off ? :delete : :create
+  action node[:nominatim][:state] == "off" ? :delete : :create
   source "nominatim.cron.erb"
   owner "root"
   group "root"
@@ -323,19 +332,19 @@ apache_module "proxy_fcgi"
 apache_module "proxy_http"
 apache_module "headers"
 
-service "php7.0-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/7.0/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[php7.0-fpm]"
+    notifies :reload, "service[php7.2-fpm]"
   end
 end