Add test for nominatim cookbook

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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 05227bb465bcbca205711d54dcf04a829b82c14c..46a03fc9148ade9af1003d54adb77b82144389de 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: nominatim
+# Cookbook:: nominatim

 # Recipe:: base
 #
 # Recipe:: base
 #

-# Copyright 2015, OpenStreetMap Foundation
+# Copyright:: 2015, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,6 +17,9 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "accounts"
+include_recipe "munin"
+

 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"]
 


@@ -48,14 +51,25 @@ file "#{node[:nominatim][:logdir]}/update.log" do
   mode 0o664
 end
 
   mode 0o664
 end
 

+# exception granted for a limited time so that they can set up their own server
+firewall_rule "increase-limits-gnome-proxy" do
+  action :accept
+  family "inet"
+  source "net:8.43.85.23"
+  dest "fw"
+  proto "tcp:syn"
+  dest_ports "https"
+  rate_limit "s:10/sec:30"
+end
+

 ## Postgresql
 
 include_recipe "postgresql"
 
 postgresql_version = node[:nominatim][:dbcluster].split("/").first
 ## Postgresql
 
 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
 
 node[:nominatim][:dbadmins].each do |user|
   postgresql_user user do


@@ -108,7 +122,7 @@ node[:nominatim][:tablespaces].each do |name, location|
   end
 end
 
   end
 end
 

-if node[:nominatim][:state] == "master" # ~FC023
+if node[:nominatim][:state] == "master"

   postgresql_user "replication" do
     cluster node[:nominatim][:dbcluster]
     password data_bag_item("nominatim", "passwords")["replication"]
   postgresql_user "replication" do
     cluster node[:nominatim][:dbcluster]
     password data_bag_item("nominatim", "passwords")["replication"]


@@ -135,25 +149,29 @@ end
 ## Nominatim backend
 
 include_recipe "git"
 ## 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 "libboost-python-dev"
-package "libexpat1-dev"
-package "zlib1g-dev"
-package "libxml2-dev"
-package "libbz2-dev"
-package "libpq-dev"
-package "libgeos++-dev"
-package "libproj-dev"
-package "osmosis"
-
-python_package "osmium"
+
+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
+  python3-pyosmium
+  pyosmium
+  python3-psycopg2
+  php
+  php-fpm
+  php-pgsql
+  php-intl
+]

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


@@ -209,7 +227,7 @@ template "#{build_directory}/settings/local.php" do
             :log_file => "#{node[:nominatim][:logdir]}/query.log"
 end
 
             :log_file => "#{node[:nominatim][:logdir]}/query.log"
 end
 

-if node[:nominatim][:flatnode_file] # ~FC023
+if node[:nominatim][:flatnode_file]

   directory File.dirname(node[:nominatim][:flatnode_file]) do
     recursive true
   end
   directory File.dirname(node[:nominatim][:flatnode_file]) do
     recursive true
   end


@@ -223,15 +241,14 @@ template "/etc/logrotate.d/nominatim" do
 end
 
 external_data = [
 end
 
 external_data = [

-  "wikipedia_article.sql.bin",
-  "wikipedia_redirect.sql.bin",
+  "wikimedia-importance.sql.gz",

   "gb_postcode_data.sql.gz"
 ]
 
 external_data.each do |fname|
   remote_file "#{source_directory}/data/#{fname}" do
     action :create_if_missing
   "gb_postcode_data.sql.gz"
 ]
 
 external_data.each do |fname|
   remote_file "#{source_directory}/data/#{fname}" do
     action :create_if_missing

-    source "http://www.nominatim.org/data/#{fname}"
+    source "https://www.nominatim.org/data/#{fname}"

     owner "nominatim"
     group "nominatim"
     mode 0o644
     owner "nominatim"
     group "nominatim"
     mode 0o644


@@ -240,14 +257,14 @@ end
 
 remote_file "#{source_directory}/data/country_osm_grid.sql.gz" do
   action :create_if_missing
 
 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"
+  source "https://www.nominatim.org/data/country_grid.sql.gz"

   owner "nominatim"
   group "nominatim"
   mode 0o644
 end
 
 template "/etc/cron.d/nominatim" do
   owner "nominatim"
   group "nominatim"
   mode 0o644
 end
 
 template "/etc/cron.d/nominatim" do

-  action node[:nominatim][:state] == :off ? :delete : :create
+  action node[:nominatim][:state] == "off" ? :delete : :create

   source "nominatim.cron.erb"
   owner "root"
   group "root"
   source "nominatim.cron.erb"
   owner "root"
   group "root"


@@ -290,81 +307,68 @@ end
 
 ## webserver frontend
 
 
 ## webserver frontend
 

-template "#{build_directory}/settings/ip_blocks.conf" do
-  action :create_if_missing
-  source "ipblocks.erb"
-  owner "nominatim"
-  group "nominatim"
-  mode 0o664
-end
-
-file "#{build_directory}/settings/apache_blocks.conf" do
-  action :create_if_missing
+directory "#{basedir}/etc" do

   owner "nominatim"
   owner "nominatim"

-  group "nominatim"
-  mode 0o664
+  group "adm"
+  mode 0o775

 end
 
 end
 

-file "#{build_directory}/settings/ip_blocks.map" do
-  action :create_if_missing
-  owner "nominatim"
-  group "nominatim"
-  mode 0o664
+%w[user_agent referrer email].each do |name|
+  file "#{basedir}/etc/nginx_blocked_#{name}.conf" do
+    action :create_if_missing
+    owner "nominatim"
+    group "adm"
+    mode 0o664
+  end

 end
 
 end
 

-include_recipe "apache"
-
-package "php"
-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"
-
-service "php7.0-fpm" do
+service "php7.2-fpm" do

   action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end
 
 node[:nominatim][:fpm_pools].each do |name, data|
   action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end
 
 node[:nominatim][:fpm_pools].each do |name, data|

-  template "/etc/php/7.0/fpm/pool.d/#{name}.conf" do
+  template "/etc/php/7.2/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[php7.0-fpm]"
+    notifies :reload, "service[php7.2-fpm]"

   end
 end
 
   end
 end
 

-ssl_certificate "nominatim.openstreetmap.org" do
-  domains ["nominatim.openstreetmap.org",
+ssl_certificate node[:fqdn] do
+  domains [node[:fqdn],
+           "nominatim.openstreetmap.org",

            "nominatim.osm.org",
            "nominatim.openstreetmap.com",
            "nominatim.openstreetmap.net",
            "nominatim.openstreetmaps.org",
            "nominatim.openmaps.org"]
            "nominatim.osm.org",
            "nominatim.openstreetmap.com",
            "nominatim.openstreetmap.net",
            "nominatim.openstreetmaps.org",
            "nominatim.openmaps.org"]

-  notifies :reload, "service[apache2]"
+  notifies :reload, "service[nginx]"

 end
 
 end
 

-apache_site "nominatim.openstreetmap.org" do
-  template "apache.erb"
-  directory build_directory
-  variables :pools => node[:nominatim][:fpm_pools]
+package "apache2" do
+  action :remove

 end
 
 end
 

-apache_site "default" do
-  action [:disable]
+include_recipe "nginx"
+
+nginx_site "default" do
+  action [:delete]

 end
 
 end
 

-template "/etc/logrotate.d/apache2" do
-  source "logrotate.apache.erb"
+nginx_site "nominatim" do
+  template "nginx.erb"
+  directory build_directory
+  variables :pools => node[:nominatim][:fpm_pools],
+            :frontends => search(:node, "recipes:web\\:\\:frontend"),
+            :confdir => "#{basedir}/etc"
+end
+
+template "/etc/logrotate.d/nginx" do
+  source "logrotate.nginx.erb"

   owner "root"
   group "root"
   mode 0o644
   owner "root"
   group "root"
   mode 0o644


@@ -388,12 +392,17 @@ munin_plugin "nominatim_requests" do
   target "#{source_directory}/munin/nominatim_requests_querylog"
 end
 
   target "#{source_directory}/munin/nominatim_requests_querylog"
 end
 

-munin_plugin "nominatim_throttled_ips" do
-  target "#{source_directory}/munin/nominatim_throttled_ips"
-end
-

 directory "#{basedir}/status" do
   owner "nominatim"
   group "postgres"
   mode 0o775
 end
 directory "#{basedir}/status" do
   owner "nominatim"
   group "postgres"
   mode 0o775
 end

+
+include_recipe "fail2ban"
+
+fail2ban_jail "nominatim_limit_req" do
+  filter "nginx-limit-req"
+  logpath "#{node[:nominatim][:logdir]}/nominatim.openstreetmap.org-error.log"
+  ports [80, 443]
+  maxretry 5
+end