Update default SSL cipher list and remove tilecache override

[chef.git] / roles / tilecache.rb

diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index 3a6d7fa5522c713da022fbe71e2d9308b2a78852..438f61992d27d2395a15ef38f5b3a61c6add9f6c 100644 (file)
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -2,8 +2,15 @@ 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 => {
@@ -15,7 +22,7 @@ default_attributes(
     :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 => {
@@ -28,6 +35,5 @@ default_attributes(
 )
 
 run_list(
-  "role[geodns]",
   "recipe[tilecache]"
 )