imagery: remove ubuntugis-unstable apt

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

diff --git a/roles/db-slave.rb b/roles/db-slave.rb
index c80f9a4cb5512520232ab2877f7f22c94f026b10..30c4a79bf1c62619a929c466fb353da737da0351 100644 (file)
--- a/roles/db-slave.rb
+++ b/roles/db-slave.rb
@@ -3,19 +3,18 @@ description "Role applied to all slave database servers"
 
 default_attributes(
   :postgresql => {
 
 default_attributes(
   :postgresql => {

-    :versions => ["9.1"],

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

-          :host => "katla.bm.openstreetmap.org",
+          :host => "karm.ams.openstreetmap.org",

           :port => "5432",
           :user => "replication",
           :passwords => { :bag => "db", :item => "passwords" }
         },
           :port => "5432",
           :user => "replication",
           :passwords => { :bag => "db", :item => "passwords" }
         },

-        :restore_command => "/usr/bin/rsync katla.bm.openstreetmap.org::archive/%f %p"
+        :restore_command => "/usr/local/bin/openstreetmap-wal-e --terse wal-fetch %f %p"

       }
     }
   }
       }
     }
   }