nominatim: replace node references in templates with variables

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

diff --git a/cookbooks/nominatim/recipes/base.rb b/cookbooks/nominatim/recipes/base.rb
index da10a90010a2db3631543963c8a76d5cadb5e726..97cf576c6f4050e3070b5c6b5b9948eb22603441 100644 (file)
--- a/cookbooks/nominatim/recipes/base.rb
+++ b/cookbooks/nominatim/recipes/base.rb
@@ -32,6 +32,7 @@ apache_module "rewrite"
 apache_module "proxy"
 apache_module "proxy_fcgi"
 apache_module "proxy_http"
 apache_module "proxy"
 apache_module "proxy_fcgi"
 apache_module "proxy_http"

+apache_module "headers"

 
 home_directory = data_bag_item("accounts", "nominatim")["home"]
 source_directory = "#{home_directory}/nominatim"
 
 home_directory = data_bag_item("accounts", "nominatim")["home"]
 source_directory = "#{home_directory}/nominatim"


@@ -54,7 +55,7 @@ node[:nominatim][:fpm_pools].each do |name, data|
     source "fpm.conf.erb"
     owner "root"
     group "root"
     source "fpm.conf.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     variables data.merge(:name => name, :port => data[:port])
     notifies :reload, "service[php5-fpm]"
   end
     variables data.merge(:name => name, :port => data[:port])
     notifies :reload, "service[php5-fpm]"
   end


@@ -68,7 +69,7 @@ end
 directory node[:nominatim][:logdir] do
   owner "nominatim"
   group "nominatim"
 directory node[:nominatim][:logdir] do
   owner "nominatim"
   group "nominatim"

-  mode 0755
+  mode 0o755

   recursive true
 end
 
   recursive true
 end
 


@@ -76,34 +77,34 @@ file "#{node[:nominatim][:logdir]}/query.log" do
   action :create_if_missing
   owner "www-data"
   group "adm"
   action :create_if_missing
   owner "www-data"
   group "adm"

-  mode 0664
+  mode 0o664

 end
 
 file "#{node[:nominatim][:logdir]}/update.log" do
   action :create_if_missing
   owner "nominatim"
   group "adm"
 end
 
 file "#{node[:nominatim][:logdir]}/update.log" do
   action :create_if_missing
   owner "nominatim"
   group "adm"

-  mode 0664
+  mode 0o664

 end
 
 directory "#{home_directory}/status" do
   owner "nominatim"
   group "postgres"
 end
 
 directory "#{home_directory}/status" do
   owner "nominatim"
   group "postgres"

-  mode 0775
+  mode 0o775

 end
 
 template "/etc/logrotate.d/nominatim" do
   source "logrotate.nominatim.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/logrotate.d/nominatim" do
   source "logrotate.nominatim.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

 end
 
 template "/etc/logrotate.d/apache2" do
   source "logrotate.apache.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/logrotate.d/apache2" do
   source "logrotate.apache.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

 end
 
 package "osmosis"
 end
 
 package "osmosis"


@@ -140,7 +141,7 @@ template "#{source_directory}/.git/hooks/post-merge" do
   source "update_source.erb"
   owner "nominatim"
   group "nominatim"
   source "update_source.erb"
   owner "nominatim"
   group "nominatim"

-  mode 0755
+  mode 0o755

   variables :source_directory => source_directory
 end
 
   variables :source_directory => source_directory
 end
 


@@ -148,7 +149,7 @@ template "#{source_directory}/settings/local.php" do
   source "nominatim.erb"
   owner "nominatim"
   group "nominatim"
   source "nominatim.erb"
   owner "nominatim"
   group "nominatim"

-  mode 0664
+  mode 0o664

   variables :postgres_version => database_version
 end
 
   variables :postgres_version => database_version
 end
 


@@ -157,21 +158,21 @@ template "#{source_directory}/settings/ip_blocks.conf" do
   source "ipblocks.erb"
   owner "nominatim"
   group "nominatim"
   source "ipblocks.erb"
   owner "nominatim"
   group "nominatim"

-  mode 0664
+  mode 0o664

 end
 
 file "#{source_directory}/settings/apache_blocks.conf" do
   action :create_if_missing
   owner "nominatim"
   group "nominatim"
 end
 
 file "#{source_directory}/settings/apache_blocks.conf" do
   action :create_if_missing
   owner "nominatim"
   group "nominatim"

-  mode 0664
+  mode 0o664

 end
 
 file "#{source_directory}/settings/ip_blocks.map" do
   action :create_if_missing
   owner "nominatim"
   group "nominatim"
 end
 
 file "#{source_directory}/settings/ip_blocks.map" do
   action :create_if_missing
   owner "nominatim"
   group "nominatim"

-  mode 0664
+  mode 0o664

 end
 
 cron_action = if node[:nominatim][:enabled]
 end
 
 cron_action = if node[:nominatim][:enabled]


@@ -193,19 +194,21 @@ template "#{source_directory}/utils/nominatim-update" do
   source "updater.erb"
   user "nominatim"
   group "nominatim"
   source "updater.erb"
   user "nominatim"
   group "nominatim"

-  mode 0755
+  mode 0o755

 end
 
 template "/etc/init.d/nominatim-update" do
   source "updater.init.erb"
   user "nominatim"
   group "nominatim"
 end
 
 template "/etc/init.d/nominatim-update" do
   source "updater.init.erb"
   user "nominatim"
   group "nominatim"

-  mode 0755
+  mode 0o755

   variables :source_directory => source_directory
 end
 
 munin_plugin_conf "nominatim" do
   template "munin.erb"
   variables :source_directory => source_directory
 end
 
 munin_plugin_conf "nominatim" do
   template "munin.erb"

+  variables :db => node[:nominatim][:database][:dbname],
+            :querylog => "#{node[:nominatim][:logdir]}/query.log"

 end
 
 munin_plugin "nominatim_importlag" do
 end
 
 munin_plugin "nominatim_importlag" do


@@ -236,7 +239,7 @@ external_data.each do |fname|
     source "http://www.nominatim.org/data/#{fname}"
     owner "nominatim"
     group "nominatim"
     source "http://www.nominatim.org/data/#{fname}"
     owner "nominatim"
     group "nominatim"

-    mode 0644
+    mode 0o644

   end
 end
 
   end
 end
 


@@ -247,14 +250,15 @@ additional_scripts.each do |fname|
     source "#{fname}.erb"
     owner "root"
     group "root"
     source "#{fname}.erb"
     owner "root"
     group "root"

-    mode 0755
+    mode 0o755
+    variables :db => node[:nominatim][:database][:dbname]

   end
 end
 
 directory File.dirname(node[:nominatim][:flatnode_file]) do
   owner "nominatim"
   group "nominatim"
   end
 end
 
 directory File.dirname(node[:nominatim][:flatnode_file]) do
   owner "nominatim"
   group "nominatim"

-  mode 0755
+  mode 0o755

   recursive true
 end
 
   recursive true
 end