Correct disk cache size on drogon and gorynych

[chef.git] / roles / jakelong.rb

diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index 3af3e5152ba6bba5bf22ec8889816dff53321cdb..4eff9e02a8a3184ddb18a7841b36d87fac0c2914 100644 (file)
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -8,23 +8,30 @@ default_attributes(
         :interface => "eth0",
         :role => :external,
         :family => :inet,
         :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::260:ddff:fe46:623d"
+        :gateway => "2605:2700:0:17::1"

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

-    :cache_mem => "200 MB",
-    :cache_dir => "coss /store/squid/coss-01 7500 block-size=8192 max-size=262144 membufs=30"
+    :cache_mem => "1024 MB",
+    :cache_dir => "coss /store/squid/coss-01 24000 block-size=8192 max-size=262144 membufs=30"
+  },
+  :nginx => {
+    :cache => {
+      :proxy => {
+        :max_size => "2048M"
+      }
+    }

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


@@ -46,7 +53,6 @@ default_attributes(
     :tile_siblings => [
       "stormfly-02.openstreetmap.org",
       "ascalon.openstreetmap.org",
     :tile_siblings => [
       "stormfly-02.openstreetmap.org",
       "ascalon.openstreetmap.org",

-      "nepomuk.openstreetmap.org",

       "katie.openstreetmap.org",
       "konqi.openstreetmap.org"
     ]
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org"
     ]