Remove nominatim role from dulcy temporarily

[chef.git] / roles / nominatim-slave.rb

diff --git a/roles/nominatim-slave.rb b/roles/nominatim-slave.rb
index fd2691cd6d22569eedb844768ae43835ca55c587..0ef9a9f51233fc72459a3c4684e285596d34a7b5 100644 (file)
--- a/roles/nominatim-slave.rb
+++ b/roles/nominatim-slave.rb
@@ -3,28 +3,21 @@ description "Role applied to all slave nominatim servers"
 
 default_attributes(
   :postgresql => {
 
 default_attributes(
   :postgresql => {

-    :versions => ["9.3"],

     :settings => {
       :defaults => {
         :hot_standby => "on",
         :hot_standby_feedback => "on",
     :settings => {
       :defaults => {
         :hot_standby => "on",
         :hot_standby_feedback => "on",

-        :standby_mode => "on",
-        :primary_conninfo => {
-          :host => "pummelzacken.ucl.openstreetmap.org",
-          :port => "5432",
-          :user => "replication",
-          :passwords => { :bag => "nominatim", :item => "passwords" }
-        },
-        :restore_command => "/usr/bin/rsync pummelzacken.ucl.openstreetmap.org::archive/%f %p"
+        :standby_mode => "on"

       }
     }
   },
   :nominatim => {
       }
     }
   },
   :nominatim => {

+    :state => "slave",

     :enable_backup => false
   }
 )
 
 run_list(
     :enable_backup => false
   }
 )
 
 run_list(

-  "role[nominatim]",
-  "recipe[nominatim::slave]"
+  "recipe[nominatim::slave]",
+  "role[nominatim-base]"

 )
 )