X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0cb7f764b5c8d66c0aa73841b98647b21c35d190..7d662601bf8912a1aae72e43ea7586bf06721690:/cookbooks/nominatim/recipes/default.rb diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb index 3c9ccbc61..5d73390fc 100644 --- a/cookbooks/nominatim/recipes/default.rb +++ b/cookbooks/nominatim/recipes/default.rb @@ -136,29 +136,23 @@ end ## Nominatim backend include_recipe "git" -include_recipe "python" - -package "build-essential" -package "cmake" -package "g++" -package "libboost-dev" -package "libboost-system-dev" -package "libboost-filesystem-dev" -package "libexpat1-dev" -package "zlib1g-dev" -package "libxml2-dev" -package "libbz2-dev" -package "libpq-dev" -package "libgeos++-dev" -package "libproj-dev" -package "osmosis" - -if node[:lsb][:release].to_f >= 18.04 - package "pyosmium" -else - package "libboost-python-dev" - python_package "osmium" -end + +package %w[ + build-essential + cmake + g++ + libboost-dev + libboost-system-dev + libboost-filesystem-dev + libexpat1-dev + zlib1g-dev + libxml2-dev + libbz2-dev + libpq-dev + libgeos++-dev + libproj-dev + pyosmium +] source_directory = "#{basedir}/nominatim" build_directory = "#{basedir}/bin" @@ -252,7 +246,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" @@ -332,25 +326,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 @@ -368,6 +356,7 @@ apache_site "nominatim.openstreetmap.org" do template "apache.erb" directory build_directory variables :pools => node[:nominatim][:fpm_pools] + only_if { node[:nominatim][:state] != "off" } end apache_site "default" do