Switch bytemark to use eddie for readonly database queries

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

diff --git a/roles/db-master.rb b/roles/db-master.rb
index ae33b625c252e01a2563863368af0ed994d47c6b..e29b7131c31a443a1b292564262890fdac5e8ecc 100644 (file)
--- a/roles/db-master.rb
+++ b/roles/db-master.rb
@@ -8,11 +8,12 @@ default_attributes(
       :defaults => {
         :wal_level => "hot_standby",
         :archive_mode => "on",
       :defaults => {
         :wal_level => "hot_standby",
         :archive_mode => "on",

-        :archive_command => "/bin/cp %p /store/postgresql/archive/%f",
-        :max_wal_senders => "2",
+        :archive_command => "/usr/local/bin/openstreetmap-wal-e --terse wal-push %p",
+        :max_wal_senders => "3",

         :late_authentication_rules => [
           { :database => "replication", :user => "replication", :address => "146.179.159.168/32" },
           { :database => "replication", :user => "replication", :address => "146.179.159.170/32" },
         :late_authentication_rules => [
           { :database => "replication", :user => "replication", :address => "146.179.159.168/32" },
           { :database => "replication", :user => "replication", :address => "146.179.159.170/32" },

+          { :database => "replication", :user => "replication", :address => "10.0.0.10/32" },

           { :database => "replication", :user => "replication", :address => "10.0.32.40/32" }
         ]
       }
           { :database => "replication", :user => "replication", :address => "10.0.32.40/32" }
         ]
       }


@@ -30,7 +31,7 @@ default_attributes(
         :gid => "postgres",
         :transfer_logging => false,
         :hosts_allow => [
         :gid => "postgres",
         :transfer_logging => false,
         :hosts_allow => [

-          "146.179.159.168", "146.179.159.170, 10.0.32.40"
+          "146.179.159.168", "146.179.159.170, 10.0.0.10, 10.0.32.40"

         ]
       }
     }
         ]
       }
     }