Fix syntax for hash.

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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 2e5887b5ae4564a2e4f504f2399404f1f7b668b2..63734cdb8046d55b6b248caf8706ba8aaf162e66 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -20,6 +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
+  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"


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

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

 ## Postgresql
 
 include_recipe "postgresql"
 ## Postgresql
 
 include_recipe "postgresql"


@@ -244,6 +245,7 @@ template "#{source_directory}/utils/nominatim-update" do
   group "nominatim"
   mode 0o755
   variables :bindir => build_directory,
   group "nominatim"
   mode 0o755
   variables :bindir => build_directory,

+            :srcdir => source_directory,

             :logfile => "#{node[:nominatim][:logdir]}/update.log",
             :branch => node[:nominatim][:revision],
             :update_stop_file => "#{basedir}/status/updates_disabled"
             :logfile => "#{node[:nominatim][:logdir]}/update.log",
             :branch => node[:nominatim][:revision],
             :update_stop_file => "#{basedir}/status/updates_disabled"


@@ -349,7 +351,7 @@ end
 include_recipe "fail2ban"
 
 fail2ban_filter "nominatim" do
 include_recipe "fail2ban"
 
 fail2ban_filter "nominatim" do

-  failregex '^<HOST> - - \[[^]]+\] "[^"]+" 429 '
+  failregex '^<HOST> - - \[\] "[^"]+" 429 '

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


@@ -380,3 +382,9 @@ end
 munin_plugin "nominatim_throttled_ips" do
   target "#{source_directory}/munin/nominatim_throttled_ips"
 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