Fix backup expiry script to match prefixes correctly

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

diff --git a/roles/db-master.rb b/roles/db-master.rb
index 1bff6f2e1774e5860463bb5a6eb522d321129f01..ffea0f019038cd77345bfe1301df3cafb77d3140 100644 (file)
--- a/roles/db-master.rb
+++ b/roles/db-master.rb
@@ -7,14 +7,13 @@ default_attributes(
       :defaults => {
         :wal_level => "logical",
         :archive_mode => "on",
       :defaults => {
         :wal_level => "logical",
         :archive_mode => "on",

-        :archive_command => "/usr/local/bin/openstreetmap-wal-e --terse wal-push %p",
-        :max_wal_senders => "5",
+        :archive_command => "/usr/local/bin/openstreetmap-wal-g wal-push %p --walg-prevent-wal-overwrite=true",
+        :max_wal_senders => "10",

         :max_replication_slots => "1",
         :late_authentication_rules => [
           { :database => "replication", :user => "replication", :address => "10.0.0.4/32" },   # snap-02
           { :database => "replication", :user => "replication", :address => "10.0.0.10/32" },  # eddie
           { :database => "replication", :user => "replication", :address => "10.0.32.40/32" }, # katla
         :max_replication_slots => "1",
         :late_authentication_rules => [
           { :database => "replication", :user => "replication", :address => "10.0.0.4/32" },   # snap-02
           { :database => "replication", :user => "replication", :address => "10.0.0.10/32" },  # eddie
           { :database => "replication", :user => "replication", :address => "10.0.32.40/32" }, # katla

-          { :database => "replication", :user => "replication", :address => "10.0.48.5/32" },  # ramoth

           { :database => "replication", :user => "replication", :address => "10.0.48.49/32" }, # snap-01
           { :database => "replication", :user => "replication", :address => "10.0.48.50/32" }, # karm
           { :database => "replication", :user => "replication", :address => "10.0.64.50/32" }  # snap-03
           { :database => "replication", :user => "replication", :address => "10.0.48.49/32" }, # snap-01
           { :database => "replication", :user => "replication", :address => "10.0.48.50/32" }, # karm
           { :database => "replication", :user => "replication", :address => "10.0.64.50/32" }  # snap-03