X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/a5bf63a4db83a924cefa11797f1a1403e44d6c9c..242e569f6b67381cf7ec98dc6e034dc5b5007476:/cookbooks/nominatim/recipes/default.rb

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 3f8b81459..b7954af92 100644
--- 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"]
 
-directory "#{basedir}" do
+directory basedir do
   owner "nominatim"
   group "nominatim"
   mode 0o755
   recursive true
 end
 
-
 directory node[:nominatim][:logdir] do
   owner "nominatim"
   group "nominatim"
@@ -332,6 +331,17 @@ node[:nominatim][:fpm_pools].each do |name, data|
   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"]
+  fallback_certificate "openstreetmap"
+  notifies :reload, "service[apache2]"
+end
+
 apache_site "nominatim.openstreetmap.org" do
   template "apache.erb"
   directory build_directory
@@ -352,7 +362,7 @@ end
 include_recipe "fail2ban"
 
 fail2ban_filter "nominatim" do
-  failregex '^<HOST> - - \[[^]]+\] "[^"]+" 429 '
+  failregex '^<HOST> - - \[\] "[^"]+" 429 '
 end
 
 fail2ban_jail "nominatim" do