X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3064ee8e6926e79a0cca6e5ea17e4db2150b7fe8..573da82d342b0197451448a59a239dfd8908d359:/cookbooks/nominatim/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 66eda9587..f424061af 100644
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -135,6 +135,7 @@ end
 ## Nominatim backend
 
 include_recipe "git"
+include_recipe "python"
 
 package "build-essential"
 package "cmake"
@@ -142,6 +143,7 @@ package "g++"
 package "libboost-dev"
 package "libboost-system-dev"
 package "libboost-filesystem-dev"
+package "libboost-python-dev"
 package "libexpat1-dev"
 package "zlib1g-dev"
 package "libxml2-dev"
@@ -149,7 +151,9 @@ package "libbz2-dev"
 package "libpq-dev"
 package "libgeos++-dev"
 package "libproj-dev"
-package "pyosmium"
+package "osmosis"
+
+python_package "osmium"
 
 source_directory = "#{basedir}/nominatim"
 build_directory = "#{basedir}/bin"
@@ -323,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