Configure karm as a database master

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 901a0512cd005d7c77a47bda8dcaedb9b36f7f26..e1b21e67d7203a0e4ecbcbc0a5e027ea703017cf 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -19,6 +19,7 @@ default_attributes(
     }
   },
   :postgresql => {
+    :versions => ["9.3"],
     :settings => {
       :defaults => {
         :listen_addresses => "10.0.0.20",
@@ -36,22 +37,7 @@ default_attributes(
       :dbname => "nominatim",
       :postgis => "2.1"
     },
-    :fpm_pools => {
-      :www => {
-        :port => "8000",
-        :pm => "dynamic",
-        :max_children => "60"
-      },
-      :bulk => {
-        :port => "8001",
-        :pm => "static",
-        :max_children => "10"
-      }
-    },
     :redirects => {
-      :reverse => "dulcy.openstreetmap.org",
-      :search => "dulcy.openstreetmap.org",
-      :details => "dulcy.openstreetmap.org"
     }
   },
   :hardware => {
@@ -66,5 +52,5 @@ default_attributes(
 
 run_list(
   "role[ucl-wolfson]",
-  "role[nominatim-master]"
+  "role[nominatim-standalone]"
 )