X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/73bc6e38f5f493a664a9439c44cd7ad49ff234a3..d773b34e77b24387ceba49d2dba909882896c792:/roles/longma.rb?ds=inline

diff --git a/roles/longma.rb b/roles/longma.rb
index afb38e151..a3502c6df 100644
--- a/roles/longma.rb
+++ b/roles/longma.rb
@@ -7,10 +7,13 @@ default_attributes(
       :root => "ceasar"
     }
   },
+  :hardware => {
+    :shm_size => "20g"
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
-        :interface => "eth0",
+        :interface => "ens160",
         :role => :external,
         :family => :inet,
         :address => "140.110.240.7",
@@ -18,7 +21,7 @@ default_attributes(
         :gateway => "140.110.240.254"
       },
       :external_ipv6 => {
-        :interface => "eth0",
+        :interface => "ens160",
         :role => :external,
         :family => :inet6,
         :address => "2001:e10:2000:240::7",
@@ -28,8 +31,22 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "12500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "16384 MB",
+    :cache_dir => [
+      "rock /store.new-san/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996",
+      "rock /store.new-san/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
+      "rock /store.new-san/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
+      "rock /store.new-san/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
+    ]
+  },
+  :nginx => {
+    :cache => {
+      :proxy => {
+        :directory => "/store.new-san/nginx-cache/proxy-cache",
+        :max_size => "65536M"
+      }
+    }
   },
   :tilecache => {
     :tile_parent => "hsinchu.render.openstreetmap.org"