pummelzacken: update to postges 10 and pyosmium as package

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index f424061affff9f7182e2b60083bdb8bb5030fcc4..3c9ccbc61a5afa4f9d73736266d45c275343a45a 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
@@ -143,7 +144,6 @@ 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"
@@ -153,7 +153,12 @@ package "libgeos++-dev"
 package "libproj-dev"
 package "osmosis"
 
-python_package "osmium"
+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"

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index a65bd041da3dde3448963460ed55a0c92dceb276..51f6efab8dd3bb5ec11bb954ce996265486daaa8 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -46,6 +46,7 @@ default_attributes(
     :enable_git_updates => true,
     :dbadmins => %w[lonvia tomh],
     :dbcluster => "9.6/main",
+    :postgis => "2.3",
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :logdir => "/ssd/nominatim/log",
     :tablespaces => {

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 2280a94726c4c0dc90d418053d5bb1e45ce79115..6b4829bf23e39a059f53616394682d6f63889691 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -34,7 +34,8 @@ default_attributes(
   :nominatim => {
     :state => "standalone",
     :dbadmins => %w[lonvia tomh],
-    :dbcluster => "9.6/main",
+    :dbcluster => "10.0/main",
+    :postgis => "2.4",
     :enable_backup => true,
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :tablespaces => {