From 3b93c90c88761e2da6937a8f028a7a248f6d861c Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Wed, 29 Mar 2017 18:56:23 +0100
Subject: [PATCH] Add role for angor

---
 .../templates/default/shorewall-zones.erb     |  1 +
 roles/angor.rb                                | 43 +++++++++++++++++++
 roles/inxza.rb                                | 29 +++++++++++++
 roles/za.rb                                   | 10 +++++
 4 files changed, 83 insertions(+)
 create mode 100644 roles/angor.rb
 create mode 100644 roles/inxza.rb
 create mode 100644 roles/za.rb

diff --git a/cookbooks/networking/templates/default/shorewall-zones.erb b/cookbooks/networking/templates/default/shorewall-zones.erb
index d1875b599..629ad0100 100644
--- a/cookbooks/networking/templates/default/shorewall-zones.erb
+++ b/cookbooks/networking/templates/default/shorewall-zones.erb
@@ -33,3 +33,4 @@ ds:osm		<%= @type %>
 uz:osm          <%= @type %>
 ovh:osm         <%= @type %>
 ffr:osm         <%= @type %>
+ixz:osm         <%= @type %>
diff --git a/roles/angor.rb b/roles/angor.rb
new file mode 100644
index 000000000..34af680e4
--- /dev/null
+++ b/roles/angor.rb
@@ -0,0 +1,43 @@
+name "angor"
+description "Master role applied to angor"
+
+default_attributes(
+  :networking => {
+    :interfaces => {
+      :external_ipv4 => {
+        :interface => "eno1",
+        :role => :external,
+        :family => :inet,
+        :address => "196.10.54.165",
+        :prefix => "29",
+        :gateway => "196.10.54.161"
+      },
+      :external_ipv6 => {
+        :interface => "eno1",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:43f8:1f4:b00:b283:feff:fed8:dd45",
+        :prefix => "64"
+      }
+    }
+  },
+  :squid => {
+    :cache_mem => "6100 MB",
+    :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
+  },
+  :tilecache => {
+    :tile_parent => "london.render.openstreetmap.org",
+    :tile_siblings => [
+      "trogdor.openstreetmap.org",
+      "katie.openstreetmap.org",
+      "konqi.openstreetmap.org",
+      "ridgeback.openstreetmap.org",
+      "gorynych.openstreetmap.org"
+    ]
+  }
+)
+
+run_list(
+  "role[inxza]",
+  "role[tilecache]"
+)
diff --git a/roles/inxza.rb b/roles/inxza.rb
new file mode 100644
index 000000000..520dbb6e9
--- /dev/null
+++ b/roles/inxza.rb
@@ -0,0 +1,29 @@
+name "inxza"
+description "Role applied to all servers at INX-ZA"
+
+default_attributes(
+  :hosted_by => "INX-ZA",
+  :location => "South Africa",
+  :networking => {
+    :nameservers => [
+      "196.10.52.52",
+      "196.10.54.54",
+      "196.10.55.55"
+    ],
+    :roles => {
+      :external => {
+        :zone => "ixz"
+      }
+    }
+  }
+)
+
+override_attributes(
+  :ntp => {
+    :servers => ["0.za.pool.ntp.org", "1.za.pool.ntp.org", "africa.pool.ntp.org"]
+  }
+)
+
+run_list(
+  "role[za]"
+)
diff --git a/roles/za.rb b/roles/za.rb
new file mode 100644
index 000000000..f42d36607
--- /dev/null
+++ b/roles/za.rb
@@ -0,0 +1,10 @@
+name "za"
+description "Role applied to all servers located in South Africa"
+
+override_attributes(
+  :country => "za"
+)
+
+run_list(
+  "role[base]"
+)
-- 
2.39.5