Remvoe cleanup code

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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 0d99a5cab374c8897efd62d1c27548f0a4cba5f8..220363a2a4614f360f9648f5854541b683a4ea23 100644 (file)
--- 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"
@@ -322,8 +316,6 @@ include_recipe "apache"
 package "php"
 package "php-fpm"
 package "php-pgsql"
-package "php-pear"
-package "php-db"
 package "php-intl"
 
 apache_module "rewrite"
@@ -362,6 +354,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