# 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,
basedir = data_bag_item("accounts", "nominatim")["home"]
email_errors = data_bag_item("accounts", "lonvia")["email"]
+directory basedir do
+ owner "nominatim"
+ group "nominatim"
+ mode 0o755
+ recursive true
+end
+
directory node[:nominatim][:logdir] do
owner "nominatim"
group "nominatim"
mode 0o664
end
-directory "#{basedir}/status" do
- owner "nominatim"
- group "postgres"
- mode 0o775
-end
-
## Postgresql
include_recipe "postgresql"
+postgresql_version = node[:nominatim][:dbcluster].split("/").first
+
package "postgis"
+package "postgresql-#{postgresql_version}-postgis-2.3"
node[:nominatim][:dbadmins].each do |user|
postgresql_user user do
mode 0o755
variables :archive_dir => node[:rsyncd][:modules][:archive][:path],
:update_stop_file => "#{basedir}/status/updates_disabled",
- :streaming_clients => search(:node, "nominatim_state:slave").map { |slave| slave[:fdqn] }.join(" ")
+ :streaming_clients => search(:node, "nominatim_state:slave").map { |slave| slave[:fqdn] }.join(" ")
end
end
## Nominatim backend
include_recipe "git"
+include_recipe "python"
package "build-essential"
package "cmake"
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 "libproj-dev"
package "osmosis"
+python_package "osmium"
+
source_directory = "#{basedir}/nominatim"
build_directory = "#{basedir}/bin"
enable_submodules true
user "nominatim"
group "nominatim"
+ not_if { node[:nominatim][:state] != "slave" && File.exist?("#{source_directory}/README.md") }
notifies :run, "execute[compile_nominatim]", :immediately
end
owner "nominatim"
group "nominatim"
mode 0o664
- variables :base_url => node[:nominatim][:state] == "off" ? node[:fdqn] : "nominatim.openstreetmap.org",
+ variables :base_url => node[:nominatim][:state] == "off" ? node[:fqdn] : "nominatim.openstreetmap.org",
:dbname => node[:nominatim][:dbname],
:flatnode_file => node[:nominatim][:flatnode_file],
:log_file => "#{node[:nominatim][:logdir]}/query.log"
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
end
end
+remote_file "#{source_directory}/data/country_osm_grid.sql.gz" do
+ action :create_if_missing
+ source "https://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"
owner "root"
group "root"
mode "0644"
- variables :bin_directory => "#{source_directory}/utils", :mailto => email_errors
+ variables :bin_directory => "#{source_directory}/utils",
+ :mailto => email_errors,
+ :update_maintenance_trigger => "#{basedir}/status/update_maintenance"
end
template "#{source_directory}/utils/nominatim-update" do
user "nominatim"
group "nominatim"
mode 0o755
- variables :logfile => "#{node[:nominatim][:logdir]}/update.log",
+ variables :bindir => build_directory,
+ :srcdir => source_directory,
+ :logfile => "#{node[:nominatim][:logdir]}/update.log",
:branch => node[:nominatim][:revision],
- :update_stop_file => "#{basedir}/status/updates_disabled"
+ :update_stop_file => "#{basedir}/status/updates_disabled",
+ :update_maintenance_trigger => "#{basedir}/status/update_maintenance"
end
template "/etc/init.d/nominatim-update" do
variables :source_directory => source_directory
end
-%w(backup-nominatim vacuum-db-nominatim).each do |fname|
+%w[backup-nominatim vacuum-db-nominatim].each do |fname|
template "/usr/local/bin/#{fname}" do
source "#{fname}.erb"
owner "root"
## webserver frontend
-template "#{source_directory}/settings/ip_blocks.conf" do
+template "#{build_directory}/settings/ip_blocks.conf" do
action :create_if_missing
source "ipblocks.erb"
owner "nominatim"
mode 0o664
end
-file "#{source_directory}/settings/apache_blocks.conf" do
+file "#{build_directory}/settings/apache_blocks.conf" do
action :create_if_missing
owner "nominatim"
group "nominatim"
mode 0o664
end
-file "#{source_directory}/settings/ip_blocks.map" do
+file "#{build_directory}/settings/ip_blocks.map" do
action :create_if_missing
owner "nominatim"
group "nominatim"
mode 0o664
end
-include_recipe "apache::ssl"
+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_http"
apache_module "headers"
-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
-php_confdir = node[:lsb][:release].to_f >= 15.10 ? "/etc/php/7.0" : "/etc/php5"
-
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)
- notifies :reload, "service[php5-fpm]"
+ notifies :reload, "service[php7.0-fpm]"
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 source_directory
+ directory build_directory
variables :pools => node[:nominatim][:fpm_pools]
end
include_recipe "fail2ban"
fail2ban_filter "nominatim" do
- failregex '^<HOST> - - \[[^]]+\] "[^"]+" 429 '
+ failregex "Warning ignored: <HOST>"
end
fail2ban_jail "nominatim" do
filter "nominatim"
- logpath "/var/log/apache2/nominatim.openstreetmap.org-access.log"
+ logpath "#{node[:nominatim][:logdir]}/restricted_ips.log"
ports [80, 443]
- maxretry 100
+ maxretry 3
end
munin_plugin_conf "nominatim" do
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
projects / chef.git / blobdiff