Set nomerge for nvme6n1 on karm

[chef.git] / roles / tilecache.rb

diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index 3f3f3f08d6a6a49a6a0cf56fa9eca8f01c5da126..438f61992d27d2395a15ef38f5b3a61c6add9f6c 100644 (file)
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -2,19 +2,32 @@ name "tilecache"
 description "Role applied to all tile cache servers"
 
 default_attributes(
 description "Role applied to all tile cache servers"
 
 default_attributes(

-  :ssl => {
-    :certificate => "tile.openstreetmap"
+  :accounts => {
+    :groups => {
+      :proxy => {
+        :members => [:tomh, :grant, :matt, :jburgess]
+      }
+    }
+  },
+  :apt => {
+    :sources => ["nginx"]

   },
   :sysctl => {
     :network_conntrack_time_wait => {
       :comment => "Only track completed connections for 30 seconds",
   },
   :sysctl => {
     :network_conntrack_time_wait => {
       :comment => "Only track completed connections for 30 seconds",

-      :parameters => { 
+      :parameters => {

         "net.netfilter.nf_conntrack_tcp_timeout_time_wait" => "30"
       }
     },
         "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"
+      }
+    },

     :squid_swappiness => {
       :comment => "Prefer not to swapout to free memory",
     :squid_swappiness => {
       :comment => "Prefer not to swapout to free memory",

-      :parameters => { 
+      :parameters => {

         "vm.swappiness" => "30"
       }
     }
         "vm.swappiness" => "30"
       }
     }


@@ -22,7 +35,5 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[geodns]",
-  "recipe[ssl]",

   "recipe[tilecache]"
 )
   "recipe[tilecache]"
 )