Make tilecache cookbook enable nginx cache automatically

[chef.git] / roles / tuatara.rb

diff --git a/roles/tuatara.rb b/roles/tuatara.rb
index 5399d6f14b30a58cf8fa240ade389f9ee3040f43..6e908fec72ff3a98d3c789ebdd41ec50b0935bc0 100644 (file)
--- a/roles/tuatara.rb
+++ b/roles/tuatara.rb
@@ -14,12 +14,20 @@ default_attributes(
         :address => "114.23.141.203",
         :prefix => "29",
         :gateway => "114.23.141.201"
+      },
+      :external_ipv6 => {
+        :interface => "eno1",
+        :role => :external,
+        :family => :inet6,
+        :address => "2406:1e00:b410:c24:529a:4cff:fe79:bc3b",
+        :prefix => "64",
+        :gateway => "2406:1e00:b410:c24::"
       }
     }
   },
   :squid => {
     :version => 4,
-    :cache_mem => "12288 MB",
+    :cache_mem => "10240 MB",
     :cache_dir => [
       "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996",
       "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
@@ -28,12 +36,7 @@ default_attributes(
     ]
   },
   :tilecache => {
-    :tile_parent => "wellington.render.openstreetmap.org",
-    :tile_siblings => [
-      "waima.openstreetmap.org",
-      "balerion.openstreetmap.org",
-      "longma.openstreetmap.org"
-    ]
+    :tile_parent => "wellington.render.openstreetmap.org"
   }
 )