stateofthemap: add reasonable expiry headers

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

diff --git a/roles/db-master.rb b/roles/db-master.rb
index 78de0b69f9abec0604fde5aae748ffb0bdf3a608..3bfdbd7ca2fbccb9025176e1d3d82ea982f371de 100644 (file)
--- a/roles/db-master.rb
+++ b/roles/db-master.rb
@@ -3,37 +3,21 @@ description "Role applied to all the master database server"
 
 default_attributes(
   :postgresql => {
-    :versions => ["9.1"],
+    :versions => ["9.5"],
     :settings => {
       :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" },
+          { :database => "replication", :user => "replication", :address => "10.0.48.50/32" },
+          { :database => "replication", :user => "replication", :address => "10.0.48.5/32" },
+          { :database => "replication", :user => "replication", :address => "10.0.0.10/32" },
           { :database => "replication", :user => "replication", :address => "10.0.32.40/32" }
         ]
       }
     }
-  },
-  :rsyncd => {
-    :modules => {
-      :archive => {
-        :comment => "WAL Archive",
-        :path => "/store/arrays/nvme/postgresql-archive",
-        :read_only => true,
-        :write_only => false,
-        :list => false,
-        :uid => "postgres",
-        :gid => "postgres",
-        :transfer_logging => false,
-        :hosts_allow => [
-          "146.179.159.168", "146.179.159.170, 10.0.32.40"
-        ]
-      }
-    }
   }
 )