X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/75de7f924c8f67b5feae7d2666e81da94a695928..ca9f46627de7b2dd6f2cfa48b42c3bd890eef51b:/roles/jakelong.rb

diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index 91dd691b7..8839b4803 100644
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -8,24 +8,23 @@ default_attributes(
         :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,
-        :address => "2001:470:1:41:a800:ff:fe3e:cdca",
+        :address => "2605:2700:0:17:a800:ff:fe3e:cdca",
         :prefix => "64",
-        :gateway => "fe80::260:ddff:fe46:623d"
+        :gateway => "2605:2700:0:17::1"
       }
     }
   },
   :squid => {
-    :version => 3,
-    :cache_mem => "350 MB",
-    :cache_dir => "rock /store/squid/rock-01 7500 swap-timeout=300 max-swap-rate=50 slot-size=4096 max-size=262144"
+    :cache_mem => "1024 MB",
+    :cache_dir => "coss /store/squid/coss-01 24000 block-size=8192 max-size=262144 membufs=30"
   },
   :sysctl => {
     :kvm => {
@@ -34,13 +33,11 @@ default_attributes(
         "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 => {
-        "block/xvda/queue/scheduler" => "deadline"
+        "net.netfilter.nf_conntrack_max" => "65536"
       }
     }
   },
@@ -48,8 +45,8 @@ default_attributes(
     :tile_parent => "sanfrancisco.render.openstreetmap.org",
     :tile_siblings => [
       "stormfly-02.openstreetmap.org",
+      "azure.openstreetmap.org",
       "ascalon.openstreetmap.org",
-      "nepomuk.openstreetmap.org",
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org"
     ]