nominatim: no git repo updates via chef

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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 9285e5ad5a6928f58e98a2c04e2fa63a44e6f6f2..92ac5162069811e97c9cb8f69aaeae1afc2b474c 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -52,7 +52,10 @@ end
 
 include_recipe "postgresql"
 
+postgresql_version = node[:nominatim][:dbcluster].split("/").first
+
 package "postgis"
+package "postgresql-#{postgresql_version}-postgis-2.3"
 
 node[:nominatim][:dbadmins].each do |user|
   postgresql_user user do
@@ -140,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"
@@ -173,6 +177,7 @@ git source_directory do
   enable_submodules true
   user "nominatim"
   group "nominatim"
+  not_if { node[:nominatim][:state] != "slave" and File.exist?("#{source_directory}/README.md") }
   notifies :run, "execute[compile_nominatim]", :immediately
 end
 
@@ -233,6 +238,14 @@ external_data.each do |fname|
   end
 end
 
+remote_file "#{source_directory}/data/country_osm_grid.sql.gz" do
+  action :create_if_missing
+  source "http://www.nominatim.org/data/country_grid.sql.gz"
+  owner "nominatim"
+  group "nominatim"
+  mode 0o644
+end
+
 template "/etc/cron.d/nominatim" do
   action node[:nominatim][:state] == :off ? :delete : :create
   source "nominatim.cron.erb"
@@ -262,7 +275,7 @@ template "/etc/init.d/nominatim-update" do
   variables :source_directory => source_directory
 end
 
-%w(backup-nominatim vacuum-db-nominatim).each do |fname|
+%w[backup-nominatim vacuum-db-nominatim].each do |fname|
   template "/usr/local/bin/#{fname}" do
     source "#{fname}.erb"
     owner "root"
@@ -303,13 +316,13 @@ package "php-fpm"
 package "php-pgsql"
 package "php-pear"
 package "php-db"
+package "php-intl"
 
 apache_module "rewrite"
 apache_module "proxy"
 apache_module "proxy_fcgi"
 apache_module "proxy_http"
 apache_module "headers"
-apache_module "reqtimeout"
 
 service "php7.0-fpm" do
   action [:enable, :start]