Merge pull request #361 from polarbearing/patch-1

[chef.git] / roles / jakelong.rb

diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index 3e7501c8eb1baf6a95bea073cc5623fbbc8b6b71..945bdd52fcb17a55eb64deee7d7898ec524da4aa 100644 (file)
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -2,29 +2,46 @@ name "jakelong"
 description "Master role applied to jakelong"
 
 default_attributes(
 description "Master role applied to jakelong"
 
 default_attributes(

+  :hardware => {
+    :shm_size => "3g"
+  },

   :networking => {
     :interfaces => {
       :external_ipv4 => {
         :interface => "eth0",
         :role => :external,
         :family => :inet,
   :networking => {
     :interfaces => {
       :external_ipv4 => {
         :interface => "eth0",
         :role => :external,
         :family => :inet,

-        :address => "64.62.205.202",
-        :prefix => "26",
-        :gateway => "64.62.205.193"
+        :address => "71.19.155.177",
+        :prefix => "24",
+        :gateway => "71.19.155.1"

       },
       :external_ipv6 => {
         :interface => "eth0",
         :role => :external,
         :family => :inet6,
       },
       :external_ipv6 => {
         :interface => "eth0",
         :role => :external,
         :family => :inet6,

-        :address => "2001:470:1:41:a800:ff:fe3e:cdca",
+        :address => "2605:2700:0:17:a800:ff:fe3e:cdca",

         :prefix => "64",
         :prefix => "64",

-        :gateway => "fe80::21b:21ff:fead:e886"
+        :gateway => "2605:2700:0:17::1"

       }
     }
   },
   :squid => {
       }
     }
   },
   :squid => {

-    :cache_mem => "700 MB",
-    :cache_dir => "coss /store/squid/coss-01 10000 block-size=8192 max-size=262144 membufs=30"
+    :version => 4,
+    :cache_mem => "1024 MB",
+    :cache_dir => [
+      "rock /store/squid/rock-4096 3840 swap-timeout=200 slot-size=4096 max-size=3996",
+      "rock /store/squid/rock-8192 4800 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
+      "rock /store/squid/rock-16384 6720 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
+      "rock /store/squid/rock-32768 8640 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
+    ]
+  },
+  :nginx => {
+    :cache => {
+      :proxy => {
+        :keys_zone => "proxy_cache_zone:64M",
+        :max_size => "2048M"
+      }
+    }

   },
   :sysctl => {
     :kvm => {
   },
   :sysctl => {
     :kvm => {


@@ -33,32 +50,20 @@ default_attributes(
         "kernel.sched_min_granularity_ns" => 10000000,
         "kernel.sched_wakeup_granularity_ns" => 15000000
       }
         "kernel.sched_min_granularity_ns" => 10000000,
         "kernel.sched_wakeup_granularity_ns" => 15000000
       }

-    }
-  },
-  :sysfs => {
-    :hdd_tune => {
-      :comment => "Tune the queue for improved performance",
+    },
+    :network_conntrack_max => {
+      :comment => "Increase max number of connections tracked",

       :parameters => {
       :parameters => {

-        "block/xvda/queue/nr_requests" => "128",
-        "block/xvda/queue/scheduler" => "deadline"
+        "net.netfilter.nf_conntrack_max" => "65536"

       }
     }
   },
   :tilecache => {
       }
     }
   },
   :tilecache => {

-    :tile_parent => "sanfrancisco.render.openstreetmap.org",
-    :tile_siblings => [
-      "nadder-01.openstreetmap.org",
-      "nadder-02.openstreetmap.org",
-      "stormfly-02.openstreetmap.org",
-      "nepomuk.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org"
-    ]
+    :tile_parent => "sanfrancisco.render.openstreetmap.org"

   }
 )
 
 run_list(
   "role[prgmr]",
   }
 )
 
 run_list(
   "role[prgmr]",

-  "role[geodns]",

   "role[tilecache]"
 )
   "role[tilecache]"
 )