Revert "nominatim: switch pyosmium from pip to packaged version"

This reverts commit 3064ee8e6926e79a0cca6e5ea17e4db2150b7fe8.

pyosmium only available for 18.04

diff --git a/cookbooks/nominatim/metadata.rb b/cookbooks/nominatim/metadata.rb
index 37d66d7aabbb98fa227ee4898ddc8018ab8adc03..20f5012c9056d798ef8ae22d8727e35edd9e7714 100644 (file)
--- a/cookbooks/nominatim/metadata.rb
+++ b/cookbooks/nominatim/metadata.rb
@@ -10,3 +10,4 @@ depends           "apache"
 depends           "postgresql"
 depends           "git"
 depends           "fail2ban"
+depends           "python"

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 66eda9587feff5707ebdc5d42eb5e15c9ff23d00..128bb34cf99b92d73e0ecd61173f7ab62a032397 100644 (file)
--- 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"