From 00c039bb5466b2e22ab28ef7c6c83cd22b3b7d47 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 8 May 2018 21:56:12 +0100
Subject: [PATCH] Add role for ascalon

---
 .../templates/default/shorewall-zones.erb     |  1 +
 roles/ascalon.rb                              | 34 +++++++++++++++++++
 roles/ca.rb                                   | 10 ++++++
 roles/jakelong.rb                             |  3 +-
 roles/netalerts.rb                            | 28 +++++++++++++++
 roles/stormfly-02.rb                          |  3 +-
 6 files changed, 75 insertions(+), 4 deletions(-)
 create mode 100644 roles/ascalon.rb
 create mode 100644 roles/ca.rb
 create mode 100644 roles/netalerts.rb

diff --git a/cookbooks/networking/templates/default/shorewall-zones.erb b/cookbooks/networking/templates/default/shorewall-zones.erb
index 01f819f1d..b650d7e18 100644
--- a/cookbooks/networking/templates/default/shorewall-zones.erb
+++ b/cookbooks/networking/templates/default/shorewall-zones.erb
@@ -36,3 +36,4 @@ ffr:osm         <%= @type %>
 ixz:osm         <%= @type %>
 grn:osm         <%= @type %>
 g5s:osm         <%= @type %>
+na:osm          <%= @type %>
diff --git a/roles/ascalon.rb b/roles/ascalon.rb
new file mode 100644
index 000000000..073bdcb2f
--- /dev/null
+++ b/roles/ascalon.rb
@@ -0,0 +1,34 @@
+name "ascalon"
+description "Master role applied to ascalon"
+
+default_attributes(
+  :networking => {
+    :interfaces => {
+      :external_ipv4 => {
+        :interface => "eth0",
+        :role => :external,
+        :family => :inet,
+        :address => "184.107.48.228",
+        :prefix => "27",
+        :gateway => "184.107.48.225"
+      }
+    }
+  },
+  :squid => {
+    :cache_mem => "16000 MB",
+    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+  },
+  :tilecache => {
+    :tile_parent => "montreal.render.openstreetmap.org",
+    :tile_siblings => [
+      "stormfly-02.openstreetmap.org",
+      "jakelong.openstreetmap.org"
+    ]
+  }
+)
+
+run_list(
+  "role[netalerts]",
+  "role[geodns]",
+  "role[tilecache]"
+)
diff --git a/roles/ca.rb b/roles/ca.rb
new file mode 100644
index 000000000..3d83f885c
--- /dev/null
+++ b/roles/ca.rb
@@ -0,0 +1,10 @@
+name "ca"
+description "Role applied to all servers located in Canada"
+
+override_attributes(
+  :country => "ca"
+)
+
+run_list(
+  "role[base]"
+)
diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index 5d3f5ef93..abe8d31bb 100644
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -46,9 +46,8 @@ default_attributes(
   :tilecache => {
     :tile_parent => "sanfrancisco.render.openstreetmap.org",
     :tile_siblings => [
-      "nadder-01.openstreetmap.org",
-      "nadder-02.openstreetmap.org",
       "stormfly-02.openstreetmap.org",
+      "ascalon.openstreetmap.org",
       "nepomuk.openstreetmap.org",
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org"
diff --git a/roles/netalerts.rb b/roles/netalerts.rb
new file mode 100644
index 000000000..6f401ecc5
--- /dev/null
+++ b/roles/netalerts.rb
@@ -0,0 +1,28 @@
+name "netalerts"
+description "Role applied to all servers at NetAlerts"
+
+default_attributes(
+  :hosted_by => "NetAlerts",
+  :location => "Montréal, Canada",
+  :networking => {
+    :nameservers => [
+      "209.172.41.202",
+      "209.172.41.200"
+    ],
+    :roles => {
+      :external => {
+        :zone => "na"
+      }
+    }
+  }
+)
+
+override_attributes(
+  :ntp => {
+    :servers => ["0.ca.pool.ntp.org", "1.ca.pool.ntp.org", "america.pool.ntp.org"]
+  }
+)
+
+run_list(
+  "role[ca]"
+)
diff --git a/roles/stormfly-02.rb b/roles/stormfly-02.rb
index 76c62732a..865ba66a0 100644
--- a/roles/stormfly-02.rb
+++ b/roles/stormfly-02.rb
@@ -25,8 +25,7 @@ default_attributes(
   :tilecache => {
     :tile_parent => "corvallis.render.openstreetmap.org",
     :tile_siblings => [
-      "nadder-01.openstreetmap.org",
-      "nadder-02.openstreetmap.org",
+      "ascalon.openstreetmap.org",
       "jakelong.openstreetmap.org",
       "nepomuk.openstreetmap.org",
       "lurien.openstreetmap.org"
-- 
2.43.2