nominatim: add postgis package

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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 3f8b814590a4b05ee2ff1ba350b72c5064782f6d..14d70d9b3063ca6477dfe56f6268432842b69250 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -20,14 +20,13 @@
 basedir = data_bag_item("accounts", "nominatim")["home"]
 email_errors = data_bag_item("accounts", "lonvia")["email"]
 
 basedir = data_bag_item("accounts", "nominatim")["home"]
 email_errors = data_bag_item("accounts", "lonvia")["email"]
 

-directory "#{basedir}" do
+directory basedir do

   owner "nominatim"
   group "nominatim"
   mode 0o755
   recursive true
 end
 
   owner "nominatim"
   group "nominatim"
   mode 0o755
   recursive true
 end
 

-

 directory node[:nominatim][:logdir] do
   owner "nominatim"
   group "nominatim"
 directory node[:nominatim][:logdir] do
   owner "nominatim"
   group "nominatim"


@@ -53,7 +52,10 @@ end
 
 include_recipe "postgresql"
 
 
 include_recipe "postgresql"
 

+postgresql_version = node[:nominatim][:dbcluster].split("/").first
+

 package "postgis"
 package "postgis"

+package "postgresql-#{postgresql_version}-postgis-2.3"

 
 node[:nominatim][:dbadmins].each do |user|
   postgresql_user user do
 
 node[:nominatim][:dbadmins].each do |user|
   postgresql_user user do


@@ -133,6 +135,7 @@ end
 ## Nominatim backend
 
 include_recipe "git"
 ## Nominatim backend
 
 include_recipe "git"

+include_recipe "python"

 
 package "build-essential"
 package "cmake"
 
 package "build-essential"
 package "cmake"


@@ -140,6 +143,7 @@ package "g++"
 package "libboost-dev"
 package "libboost-system-dev"
 package "libboost-filesystem-dev"
 package "libboost-dev"
 package "libboost-system-dev"
 package "libboost-filesystem-dev"

+package "libboost-python-dev"

 package "libexpat1-dev"
 package "zlib1g-dev"
 package "libxml2-dev"
 package "libexpat1-dev"
 package "zlib1g-dev"
 package "libxml2-dev"


@@ -149,6 +153,8 @@ package "libgeos++-dev"
 package "libproj-dev"
 package "osmosis"
 
 package "libproj-dev"
 package "osmosis"
 

+python_package "osmium"
+

 source_directory = "#{basedir}/nominatim"
 build_directory = "#{basedir}/bin"
 
 source_directory = "#{basedir}/nominatim"
 build_directory = "#{basedir}/bin"
 


@@ -231,6 +237,14 @@ external_data.each do |fname|
   end
 end
 
   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"
 template "/etc/cron.d/nominatim" do
   action node[:nominatim][:state] == :off ? :delete : :create
   source "nominatim.cron.erb"


@@ -294,7 +308,7 @@ file "#{build_directory}/settings/ip_blocks.map" do
   mode 0o664
 end
 
   mode 0o664
 end
 

-include_recipe "apache::ssl"
+include_recipe "apache"

 
 package "php"
 package "php-fpm"
 
 package "php"
 package "php-fpm"


@@ -307,31 +321,34 @@ apache_module "proxy"
 apache_module "proxy_fcgi"
 apache_module "proxy_http"
 apache_module "headers"
 apache_module "proxy_fcgi"
 apache_module "proxy_http"
 apache_module "headers"

+apache_module "reqtimeout"

 
 

-service "php5-fpm" do
-  if node[:lsb][:release].to_f >= 15.10
-    provider Chef::Provider::Service::Systemd
-    service_name "php7.0-fpm"
-  elsif node[:lsb][:release].to_f >= 14.04
-    provider Chef::Provider::Service::Upstart
-  end
+service "php7.0-fpm" do

   action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end
 
   action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end
 

-php_confdir = node[:lsb][:release].to_f >= 15.10 ? "/etc/php/7.0" : "/etc/php5"
-

 node[:nominatim][:fpm_pools].each do |name, data|
 node[:nominatim][:fpm_pools].each do |name, data|

-  template "#{php_confdir}/fpm/pool.d/#{name}.conf" do
+  template "/etc/php/7.0/fpm/pool.d/#{name}.conf" do

     source "fpm.conf.erb"
     owner "root"
     group "root"
     mode 0o644
     variables data.merge(:name => name)
     source "fpm.conf.erb"
     owner "root"
     group "root"
     mode 0o644
     variables data.merge(:name => name)

-    notifies :reload, "service[php5-fpm]"
+    notifies :reload, "service[php7.0-fpm]"

   end
 end
 
   end
 end
 

+ssl_certificate "nominatim.openstreetmap.org" do
+  domains ["nominatim.openstreetmap.org",
+           "nominatim.osm.org",
+           "nominatim.openstreetmap.com",
+           "nominatim.openstreetmap.net",
+           "nominatim.openstreetmaps.org",
+           "nominatim.openmaps.org"]
+  notifies :reload, "service[apache2]"
+end
+

 apache_site "nominatim.openstreetmap.org" do
   template "apache.erb"
   directory build_directory
 apache_site "nominatim.openstreetmap.org" do
   template "apache.erb"
   directory build_directory


@@ -351,8 +368,12 @@ end
 
 include_recipe "fail2ban"
 
 
 include_recipe "fail2ban"
 

+web_servers = search(:node, "recipes:web\\:\\:frontend").collect do |n| # ~FC010
+  n.ipaddresses(:role => :external)
+end.flatten
+

 fail2ban_filter "nominatim" do
 fail2ban_filter "nominatim" do

-  failregex '^<HOST> - - \[[^]]+\] "[^"]+" 429 '
+  failregex '^<HOST> - - \[\] "[^"]+" (408|429) '

 end
 
 fail2ban_jail "nominatim" do
 end
 
 fail2ban_jail "nominatim" do


@@ -360,6 +381,7 @@ fail2ban_jail "nominatim" do
   logpath "/var/log/apache2/nominatim.openstreetmap.org-access.log"
   ports [80, 443]
   maxretry 100
   logpath "/var/log/apache2/nominatim.openstreetmap.org-access.log"
   ports [80, 443]
   maxretry 100

+  ignoreips web_servers

 end
 
 munin_plugin_conf "nominatim" do
 end
 
 munin_plugin_conf "nominatim" do