From: Tom Hughes <tom@compton.nu>
Date: Wed, 25 Jan 2023 18:34:08 +0000 (+0000)
Subject: Allow replication connections to slave databases
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/562a0079ecbb7986653f018bf9cdaaf2b053d873

Allow replication connections to slave databases
---

diff --git a/roles/db-master.rb b/roles/db-master.rb
index b7bbdd369..0bb927739 100644
--- a/roles/db-master.rb
+++ b/roles/db-master.rb
@@ -7,14 +7,7 @@ default_attributes(
       :defaults => {
         :archive_mode => "on",
         :archive_command => "/usr/local/bin/openstreetmap-wal-g wal-push %p --walg-prevent-wal-overwrite=true",
-        :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.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
-        ]
+        :max_replication_slots => "1"
       }
     }
   }
diff --git a/roles/db.rb b/roles/db.rb
index ff308c8e5..f0cbe0f97 100644
--- a/roles/db.rb
+++ b/roles/db.rb
@@ -50,7 +50,12 @@ default_attributes(
         :log_min_duration_statement => "1000",
         :late_authentication_rules => [
           { :address => "10.0.48.0/20" }, # amsterdam
-          { :address => "10.0.64.0/20" }  # dublin
+          { :address => "10.0.64.0/20" }, # dublin
+          { :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.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
         ]
       }
     }