From 1c14a35ff753f0932435b1ce189e97ab17b2f72a Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 9 May 2016 18:30:15 +0100
Subject: [PATCH] Fix munin for internal-only hosts at Bytemark

---
 cookbooks/munin/templates/default/munin.conf.erb |  2 ++
 cookbooks/networking/recipes/default.rb          |  4 ++--
 roles/grisu.rb                                   |  7 +++++++
 roles/ridley.rb                                  | 10 +++++++++-
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/cookbooks/munin/templates/default/munin.conf.erb b/cookbooks/munin/templates/default/munin.conf.erb
index 128d0080b..79bdbda9a 100644
--- a/cookbooks/munin/templates/default/munin.conf.erb
+++ b/cookbooks/munin/templates/default/munin.conf.erb
@@ -36,6 +36,8 @@ unknown_limit 144
     address <%= client.internal_ipaddress || client.external_ipaddress %>
 <% elsif client[:networking][:roles][:external][:zone] == "ic" -%>
     address <%= client.internal_ipaddress || client.external_ipaddress %>
+<% elsif client[:networking][:roles][:external][:zone] == "bm" -%>
+    address <%= client.internal_ipaddress || client.external_ipaddress %>
 <% elsif client.external_ipaddress -%>
     address <%= client.external_ipaddress %>
 <% end -%>
diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index e23b1dae3..485f852a6 100644
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -221,8 +221,8 @@ end
     source zone
     dest "fw"
     proto "udp"
-    dest_ports "1194:1196"
-    source_ports "1194:1196"
+    dest_ports "1194:1197"
+    source_ports "1194:1197"
   end
 end
 
diff --git a/roles/grisu.rb b/roles/grisu.rb
index 09e7a4e6a..e536c0f61 100644
--- a/roles/grisu.rb
+++ b/roles/grisu.rb
@@ -43,6 +43,13 @@ default_attributes(
         :peer => {
           :host => "fafnir.openstreetmap.org"
         }
+      },
+      :ucl2bm => {
+        :port => "1196",
+        :mode => "server",
+        :peer => {
+          :host => "ridley.openstreetmap.org"
+        }
       }
     }
   }
diff --git a/roles/ridley.rb b/roles/ridley.rb
index 47e12e7d0..bb07b565f 100644
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -67,9 +67,17 @@ default_attributes(
           :port => "1194"
         }
       },
-      :firefishy => {
+      :ucl2bm => {
         :port => "1196",
         :mode => "client",
+        :peer => {
+          :host => "grisu.openstreetmap.org",
+          :port => "1196"
+        }
+      },
+      :firefishy => {
+        :port => "1197",
+        :mode => "client",
         :peer => {
           :host => "home.firefishy.com",
           :port => "1194",
-- 
2.39.5