From 391dee0b5eea292f0b358c127623d83374d30f2c Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 25 Nov 2014 19:54:45 +0000
Subject: [PATCH] Add role for saphira

---
 .../templates/default/shorewall-zones.erb     |  1 +
 roles/jump.rb                                 | 28 ++++++++++++
 roles/saphira.rb                              | 44 +++++++++++++++++++
 3 files changed, 73 insertions(+)
 create mode 100644 roles/jump.rb
 create mode 100644 roles/saphira.rb

diff --git a/cookbooks/networking/templates/default/shorewall-zones.erb b/cookbooks/networking/templates/default/shorewall-zones.erb
index ab5ba7428..88c2db400 100644
--- a/cookbooks/networking/templates/default/shorewall-zones.erb
+++ b/cookbooks/networking/templates/default/shorewall-zones.erb
@@ -23,3 +23,4 @@ dt:osm		<%= @type %>
 nc:osm		<%= @type %>
 ool:osm		<%= @type %>
 cnt:osm		<%= @type %>
+jn:osm		<%= @type %>
diff --git a/roles/jump.rb b/roles/jump.rb
new file mode 100644
index 000000000..ec967bb75
--- /dev/null
+++ b/roles/jump.rb
@@ -0,0 +1,28 @@
+name "jump"
+description "Role applied to all servers at Jump Networks"
+
+default_attributes(
+  :networking => {
+    :nameservers => [
+      "185.73.44.3",
+      "2001:ba8:0:2c02::",
+      "2001:ba8:0:2c03::",
+      "2001:ba8:0:2c04::"
+    ],
+    :roles => {
+      :external => {
+        :zone => "jn"
+      }
+    }
+  }
+)
+
+override_attributes(
+  :ntp => {
+    :servers => [ "0.uk.pool.ntp.org", "1.uk.pool.ntp.org", "europe.pool.ntp.org" ]
+  }
+)
+
+run_list(
+  "role[gb]"
+)
diff --git a/roles/saphira.rb b/roles/saphira.rb
new file mode 100644
index 000000000..b05bcbae6
--- /dev/null
+++ b/roles/saphira.rb
@@ -0,0 +1,44 @@
+name "saphira"
+description "Master role applied to saphira"
+
+default_attributes(
+  :networking => {
+    :interfaces => {
+      :external_ipv4 => {
+        :interface => "eth0",
+        :role => :external,
+        :family => :inet,
+        :address => "185.73.44.30",
+        :prefix => "22",
+        :gateway => "185.73.44.1"
+      },
+      :external_ipv6 => {
+        :interface => "eth0",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:ba8:0:2c1e::",
+        :prefix => "64",
+        :gateway => "fe80::fcff:ffff:feff:ffff"
+      }
+    }
+  },
+  :squid => {
+    :cache_mem => "7500 MB",
+    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+  },
+  :tilecache => {
+    :tile_parent => "london.render.openstreetmap.org",
+    :tile_siblings => [
+      "trogdor.openstreetmap.org",
+      "tabaluga.openstreetmap.org",
+      "ridgeback.openstreetmap.org",
+      "fume.openstreetmap.org",
+      "gorynych.openstreetmap.org"
+    ]
+  }
+)
+
+run_list(
+  "role[jump]",
+  "role[tilecache]"
+)
-- 
2.43.2