X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/261e7e9cd1a9882faa4ed7087b5902ebafe25988..b6bfcebb6947656b9be5a4c888df9245bcef8cbe:/cookbooks/nominatim/recipes/default.rb

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index dfa2df7c1..29726650d 100644
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache"
+include_recipe "apache::ssl"
 include_recipe "postgresql"
 include_recipe "git"
 
@@ -35,6 +35,10 @@ home_directory = data_bag_item("accounts", "nominatim")["home"]
 source_directory = "#{home_directory}/nominatim"
 email_errors = data_bag_item("accounts", "lonvia")["email"]
 
+database_cluster = node[:nominatim][:database][:cluster]
+database_version = database_cluster.sub(/\/.*/, "")
+database_name = node[:nominatim][:database][:dbname]
+
 service "php5-fpm" do
   action [ :enable, :start ]
   supports :status => true, :restart => true, :reload => true
@@ -47,7 +51,6 @@ apache_site "nominatim.openstreetmap.org" do
 end
 
 node[:nominatim][:fpm_pools].each do |name,data|
-
   template "/etc/php5/fpm/pool.d/#{name}.conf" do
     source "fpm.conf.erb"
     owner "root"
@@ -59,32 +62,32 @@ node[:nominatim][:fpm_pools].each do |name,data|
 end
 
 postgresql_user "tomh" do
-  cluster "9.1/main"
+  cluster database_cluster
   superuser true
 end
 
 postgresql_user "lonvia" do
-  cluster "9.1/main"
+  cluster database_cluster
   superuser true
 end
 
 postgresql_user "twain" do
-  cluster "9.1/main"
+  cluster database_cluster
   superuser true
 end
 
 postgresql_user "nominatim" do
-  cluster "9.1/main"
+  cluster database_cluster
   superuser true
 end
 
 postgresql_user "www-data" do
-  cluster "9.1/main"
+  cluster database_cluster
 end
 
 postgresql_munin "nominatim" do
-  cluster "9.1/main"
-  database "nominatim"
+  cluster database_cluster
+  database database_name
 end
 
 directory "/var/log/nominatim" do
@@ -93,12 +96,20 @@ directory "/var/log/nominatim" do
   mode 0755
 end
 
+template "/etc/logrotate.d/nominatim" do
+  source "logrotate.nominatim.erb"
+  owner "root"
+  group "root"
+  mode 0644
+end
+
+
 package "osmosis"
 package "gcc"
 package "proj-bin"
 package "libgeos-c1"
-package "postgresql-9.1-postgis"
-package "postgresql-server-dev-9.1"
+package "postgresql-#{database_version}-postgis"
+package "postgresql-server-dev-#{database_version}"
 package "build-essential"
 package "libxml2-dev"
 package "libgeos-dev"