Allow database connections from VPN addresses

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

diff --git a/roles/db-master.rb b/roles/db-master.rb
index db2f4f6f9269f67eda0169cf15a599fcd2c6cae2..16562fa1b9a06761f721156ab458c71cc2a69bdf 100644 (file)
--- a/roles/db-master.rb
+++ b/roles/db-master.rb
@@ -3,7 +3,7 @@ description "Role applied to all the master database server"
 
 default_attributes(
   :postgresql => {
 
 default_attributes(
   :postgresql => {

-    :versions => [ "9.1" ],
+    :versions => ["9.1"],

     :settings => {
       :defaults => {
         :wal_level => "hot_standby",
     :settings => {
       :defaults => {
         :wal_level => "hot_standby",


@@ -12,7 +12,8 @@ default_attributes(
         :max_wal_senders => "2",
         :late_authentication_rules => [
           { :database => "replication", :user => "replication", :address => "146.179.159.168/32" },
         :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.170/32" }
+          { :database => "replication", :user => "replication", :address => "146.179.159.170/32" },
+          { :database => "replication", :user => "replication", :address => "10.0.16.4/32" }

         ]
       }
     }
         ]
       }
     }


@@ -29,7 +30,7 @@ default_attributes(
         :gid => "postgres",
         :transfer_logging => false,
         :hosts_allow => [
         :gid => "postgres",
         :transfer_logging => false,
         :hosts_allow => [

-          "146.179.159.168", "146.179.159.170"
+          "146.179.159.168", "146.179.159.170, 10.0.16.4"

         ]
       }
     }
         ]
       }
     }