X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/a7d96c8358a00088b485fadb5966eb4b231d2ff1..cec717b818ba058b4e968fe83b4b4b8e20d87b83:/roles/db-master.rb

diff --git a/roles/db-master.rb b/roles/db-master.rb
index 84dd05c55..1a23a91b3 100644
--- a/roles/db-master.rb
+++ b/roles/db-master.rb
@@ -3,23 +3,16 @@ description "Role applied to all the master database server"
 
 default_attributes(
   :postgresql => {
-    :versions => [ "9.1" ],
+    :versions => ["9.1"],
     :settings => {
       :defaults => {
         :wal_level => "hot_standby",
         :archive_mode => "on",
-        :archive_command => "/bin/cp %p /store/postgresql/system/archive/%f",
+        :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.168/32" },
+          { :database => "replication", :user => "replication", :address => "146.179.159.170/32" }
         ]
       }
     }
@@ -28,7 +21,7 @@ default_attributes(
     :modules => {
       :archive => {
         :comment => "WAL Archive",
-        :path => "/store/postgresql/system/archive",
+        :path => "/store/arrays/slow/postgresql-archive",
         :read_only => true,
         :write_only => false,
         :list => false,
@@ -36,7 +29,7 @@ default_attributes(
         :gid => "postgres",
         :transfer_logging => false,
         :hosts_allow => [
-          "146.179.159.168"
+          "146.179.159.168", "146.179.159.170"
         ]
       }
     }