Merge remote-tracking branch 'github/pull/76'

[chef.git] / roles / tilecache.rb

diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index 8e1262e81a20c2da7ba4e4f519960a288fdc513a..438f61992d27d2395a15ef38f5b3a61c6add9f6c 100644 (file)
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -2,25 +2,32 @@ name "tilecache"
 description "Role applied to all tile cache servers"
 
 default_attributes(
+  :accounts => {
+    :groups => {
+      :proxy => {
+        :members => [:tomh, :grant, :matt, :jburgess]
+      }
+    }
+  },
   :apt => {
-    :sources => [ "nginx" ]
+    :sources => ["nginx"]
   },
   :sysctl => {
     :network_conntrack_time_wait => {
       :comment => "Only track completed connections for 30 seconds",
-      :parameters => { 
+      :parameters => {
         "net.netfilter.nf_conntrack_tcp_timeout_time_wait" => "30"
       }
     },
     :network_conntrack_max => {
       :comment => "Increase max number of connections tracked",
       :parameters => {
-         "net.netfilter.nf_conntrack_max" => "131072"
+        "net.netfilter.nf_conntrack_max" => "131072"
       }
     },
     :squid_swappiness => {
       :comment => "Prefer not to swapout to free memory",
-      :parameters => { 
+      :parameters => {
         "vm.swappiness" => "30"
       }
     }
@@ -28,6 +35,5 @@ default_attributes(
 )
 
 run_list(
-  "role[geodns]",
   "recipe[tilecache]"
 )