Move backup authentication rules to the db-backup role

diff --git a/roles/db-backup.rb b/roles/db-backup.rb
index 6fab59d23a0007e623088583f0f353305a474817..f713c8058b95e0bbae8dc3ac06c275574723e1d1 100644 (file)
--- a/roles/db-backup.rb
+++ b/roles/db-backup.rb
@@ -6,6 +6,20 @@ default_attributes(
     :users => {
       :osmbackup => { :status => :role }
     }
     :users => {
       :osmbackup => { :status => :role }
     }

+  },
+  :postgresql => {
+    :settings => {
+      :defaults => {
+        :user_name_maps => {
+          :backup => [
+            { :system => "osmbackup", :postgres => "backup" }
+          ]
+        },
+        :early_authentication_rules => [
+          { :type => "local", :database => "all", :user => "backup", :method => "peer", :options => { :map => "backup" } }
+        ]
+      }
+    }

   }
 )
 
   }
 )
 

diff --git a/roles/db-master.rb b/roles/db-master.rb
index 79c8f0724e7cca6de9c1d0198655ab5def8e7fef..a341c65763ad20385d8d059cbf7db3321cef6407 100644 (file)
--- a/roles/db-master.rb
+++ b/roles/db-master.rb
@@ -10,14 +10,6 @@ default_attributes(
         :archive_mode => "on",
         :archive_command => "/bin/cp %p /store/postgresql/archive/%f",
         :max_wal_senders => "2",
         :archive_mode => "on",
         :archive_command => "/bin/cp %p /store/postgresql/archive/%f",
         :max_wal_senders => "2",

-        :user_name_maps => {
-          :backup => [
-            { :system => "osmbackup", :postgres => "backup" }
-          ]
-        },
-        :early_authentication_rules => [
-          { :type => "local", :database => "all", :user => "backup", :method => "peer", :options => { :map => "backup" } }
-        ],

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