Revert "Remove some redundant settings from chef server configuration"

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

diff --git a/roles/db-master.rb b/roles/db-master.rb
index a341c65763ad20385d8d059cbf7db3321cef6407..36d70e9023531d7fe6461a9b335f84a2c5b2c79d 100644 (file)
--- a/roles/db-master.rb
+++ b/roles/db-master.rb
@@ -3,34 +3,12 @@ description "Role applied to all the master database server"
 
 default_attributes(
   :postgresql => {
-    :versions => [ "9.1" ],
+    :monitor_queries => true,
     :settings => {
       :defaults => {
-        :wal_level => "hot_standby",
         :archive_mode => "on",
-        :archive_command => "/bin/cp %p /store/postgresql/archive/%f",
-        :max_wal_senders => "2",
-        :late_authentication_rules => [
-          { :database => "replication", :user => "replication", :address => "146.179.159.168/32" },
-          { :database => "replication", :user => "replication", :address => "146.179.159.173/32" }
-        ]
-      }
-    }
-  },
-  :rsyncd => {
-    :modules => {
-      :archive => {
-        :comment => "WAL Archive",
-        :path => "/store/postgresql/system/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.173"
-        ]
+        :archive_command => "/usr/local/bin/openstreetmap-wal-g wal-push %p --walg-prevent-wal-overwrite=true",
+        :wal_keep_size => "16384"
       }
     }
   }