From 3bc1f53eb929edcb3d93521d199e665d542de791 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Thu, 2 Jan 2014 19:04:13 +0000
Subject: [PATCH] Move tile cache sibling configuration to roles

---
 cookbooks/tilecache/attributes/default.rb       |  1 +
 .../tilecache/templates/default/squid.conf.erb  | 17 ++---------------
 roles/fume.rb                                   |  5 ++++-
 roles/jakelong.rb                               |  6 +++++-
 roles/nadder-01.rb                              |  5 ++++-
 roles/nadder-02.rb                              |  5 ++++-
 roles/trogdor.rb                                |  5 ++++-
 7 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/cookbooks/tilecache/attributes/default.rb b/cookbooks/tilecache/attributes/default.rb
index 2e8471518..e91bd9617 100644
--- a/cookbooks/tilecache/attributes/default.rb
+++ b/cookbooks/tilecache/attributes/default.rb
@@ -1,5 +1,6 @@
 
 default[:tilecache][:tile_parent] = "parent.tile.openstreetmap.org"
+default[:tilecache][:tile_siblings] = []
 
 #Per IP bucket refill rate
 default[:tilecache][:ip_bucket_refill] = "8192"
diff --git a/cookbooks/tilecache/templates/default/squid.conf.erb b/cookbooks/tilecache/templates/default/squid.conf.erb
index c4a1a951b..d8fe021ac 100644
--- a/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@ -29,21 +29,8 @@ http_access allow osmtile_sites
 acl osmtile_nocache_url urlpath_regex \.png/(status|dirty)$
 cache deny osmtile_sites osmtile_nocache_url
 
-<% if node[:fqdn] == "nadder-01.openstreetmap.org" -%>
-cache_peer nadder-02.openstreetmap.org sibling 3128 3130 proxy-only
-<% end -%>
-<% if node[:fqdn] == "nadder-02.openstreetmap.org" -%> 
-cache_peer nadder-01.openstreetmap.org sibling 3128 3130 proxy-only
-<% end -%>
-<% if node[:fqdn] == "trogdor.openstreetmap.org" -%>
-cache_peer fume.openstreetmap.org sibling 3128 3130 proxy-only
-<% end -%>
-<% if node[:fqdn] == "fume.openstreetmap.org" -%>
-cache_peer trogdor.openstreetmap.org sibling 3128 3130 proxy-only
-<% end -%>
-<% if node[:fqdn] == "jakelong.openstreetmap.org" -%>
-cache_peer nadder-01.openstreetmap.org sibling 3128 3130 proxy-only
-cache_peer nadder-02.openstreetmap.org sibling 3128 3130 proxy-only
+<% node[:tilecache][:tile_siblings].each do |sibling| -%>
+cache_peer <%= sibling %> sibling 3128 3130 proxy-only
 <% end -%>
 #Primary Parent
 cache_peer <%= node[:tilecache][:tile_parent] %> parent 80 0 no-query originserver name=osmtileAccel login=PASS connect-timeout=60 no-digest weight=1000
diff --git a/roles/fume.rb b/roles/fume.rb
index cf96ecb43..8205b3c32 100644
--- a/roles/fume.rb
+++ b/roles/fume.rb
@@ -37,7 +37,10 @@ default_attributes(
     }
   },
   :tilecache => {
-    :tile_parent => "sjobo.render.openstreetmap.org"
+    :tile_parent => "sjobo.render.openstreetmap.org",
+    :tile_siblings => [
+      "trogdor.openstreetmap.org"
+    ]
   }
 )
 
diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index b164b6c89..44878a01e 100644
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -27,7 +27,11 @@ default_attributes(
     :cache_dir => "coss /store/squid/coss-01 15000 block-size=8192 max-size=262144 membufs=30"
   },
   :tilecache => {
-    :tile_parent => "sanfrancisco.render.openstreetmap.org"
+    :tile_parent => "sanfrancisco.render.openstreetmap.org",
+    :tile_siblings => [
+      "nadder-01.openstreetmap.org",
+      "nadder-02.openstreetmap.org"
+    ]
   }
 )
 
diff --git a/roles/nadder-01.rb b/roles/nadder-01.rb
index b61d80644..b086e238e 100644
--- a/roles/nadder-01.rb
+++ b/roles/nadder-01.rb
@@ -30,7 +30,10 @@ default_attributes(
     :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
   },
   :tilecache => {
-    :tile_parent => "provo.render.openstreetmap.org"
+    :tile_parent => "provo.render.openstreetmap.org",
+    :tile_siblings => [
+      "nadder-02.openstreetmap.org"
+    ]
   }
 )
 
diff --git a/roles/nadder-02.rb b/roles/nadder-02.rb
index c2315ba9c..3fa156be3 100644
--- a/roles/nadder-02.rb
+++ b/roles/nadder-02.rb
@@ -30,7 +30,10 @@ default_attributes(
     :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
   },
   :tilecache => {
-    :tile_parent => "provo.render.openstreetmap.org"
+    :tile_parent => "provo.render.openstreetmap.org",
+    :tile_siblings => [
+      "nadder-01.openstreetmap.org"
+    ]
   }
 )
 
diff --git a/roles/trogdor.rb b/roles/trogdor.rb
index e2048af6c..74fcb3f91 100644
--- a/roles/trogdor.rb
+++ b/roles/trogdor.rb
@@ -19,7 +19,10 @@ default_attributes(
     :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
   },
   :tilecache => {
-    :tile_parent => "amsterdam.render.openstreetmap.org"
+    :tile_parent => "amsterdam.render.openstreetmap.org",
+    :tile_siblings => [
+      "fume.openstreetmap.org"
+    ]
   }
 )
 
-- 
2.43.2