Allow database connections from VPN addresses

[chef.git] / roles / db.rb

diff --git a/roles/db.rb b/roles/db.rb
index 44026b0ac0cc06383085c993e4c3448719eeb4b0..b1c9e4f05be1c9dad93cb6d6e958f74c319ededa 100644 (file)
--- a/roles/db.rb
+++ b/roles/db.rb
@@ -6,24 +6,29 @@ default_attributes(
     :users => {
       :rails => {
         :status => :role,
     :users => {
       :rails => {
         :status => :role,

-        :members => [ :tomh, :grant ]
+        :members => [:tomh, :grant]

       }
     }
   },
       }
     }
   },

+  :apt => {
+    :unattended_upgrades => {
+      :enable => false
+    }
+  },

   :munin => {
     :plugins => {
       :postgres_connections_openstreetmap => {
   :munin => {
     :plugins => {
       :postgres_connections_openstreetmap => {

-        :waiting => { 
+        :waiting => {

           :warning => 10,
           :critical => 20
         }
       },
       :postgres_locks_openstreetmap => {
           :warning => 10,
           :critical => 20
         }
       },
       :postgres_locks_openstreetmap => {

-        :accesssharelock => { 
+        :accesssharelock => {

           :warning => 900,
           :critical => 1000
         },
           :warning => 900,
           :critical => 1000
         },

-        :rowexclusivelock => { 
+        :rowexclusivelock => {

           :warning => 250,
           :critical => 300
         }
           :warning => 250,
           :critical => 300
         }


@@ -34,7 +39,7 @@ default_attributes(
     "/store/rails" => { :host => "ironbelly", :path => "/store/rails" }
   },
   :postgresql => {
     "/store/rails" => { :host => "ironbelly", :path => "/store/rails" }
   },
   :postgresql => {

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

     :settings => {
       :defaults => {
         :listen_addresses => "*",
     :settings => {
       :defaults => {
         :listen_addresses => "*",


@@ -42,8 +47,11 @@ default_attributes(
         :max_stack_depth => "7MB",
         :checkpoint_segments => "32",
         :checkpoint_completion_target => "0.8",
         :max_stack_depth => "7MB",
         :checkpoint_segments => "32",
         :checkpoint_completion_target => "0.8",

+        :cpu_tuple_cost => "0.1",

         :late_authentication_rules => [
         :late_authentication_rules => [

-          { :address => "146.179.159.160/27" }
+          { :address => "146.179.159.160/27" },
+          { :address => "10.0.16.0/20" },
+          { :address => "10.0.32.0/20" }

         ]
       }
     }
         ]
       }
     }