From aab322e1d96e07027666b49a7fbf1443a0367eec Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sat, 28 Jul 2018 13:47:45 +0100
Subject: [PATCH] Add role for noomoahk

---
 .../templates/default/shorewall-zones.erb     |  1 +
 roles/noomoahk.rb                             | 42 +++++++++++++++++++
 roles/tetaneutral.rb                          | 28 +++++++++++++
 3 files changed, 71 insertions(+)
 create mode 100644 roles/noomoahk.rb
 create mode 100644 roles/tetaneutral.rb

diff --git a/cookbooks/networking/templates/default/shorewall-zones.erb b/cookbooks/networking/templates/default/shorewall-zones.erb
index 0759c0dd1..7f9bd2c44 100644
--- a/cookbooks/networking/templates/default/shorewall-zones.erb
+++ b/cookbooks/networking/templates/default/shorewall-zones.erb
@@ -38,3 +38,4 @@ ixz:osm         <%= @type %>
 grn:osm         <%= @type %>
 g5s:osm         <%= @type %>
 na:osm          <%= @type %>
+thh:osm         <%= @type %>
diff --git a/roles/noomoahk.rb b/roles/noomoahk.rb
new file mode 100644
index 000000000..e761d8038
--- /dev/null
+++ b/roles/noomoahk.rb
@@ -0,0 +1,42 @@
+name "noomoahk"
+description "Master role applied to noomoahk"
+
+default_attributes(
+  :networking => {
+    :interfaces => {
+      :external_ipv4 => {
+        :interface => "ens3",
+        :role => :external,
+        :family => :inet,
+        :address => "91.224.148.166",
+        :prefix => "32",
+        :gateway => "89.234.156.230"
+      },
+      :external_ipv6 => {
+        :interface => "ens3",
+        :role => :external,
+        :family => :inet6,
+        :address => "2a03:7220:8080:a600::1",
+        :prefix => "56",
+        :gateway => "fe80::1"
+      }
+    }
+  },
+  :squid => {
+    :cache_mem => "6100 MB",
+    :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
+  },
+  :tilecache => {
+    :tile_parent => "toulouse.render.openstreetmap.org",
+    :tile_siblings => [
+      "nepomuk.openstreetmap.org",
+      "ladon.openstreetmap.org",
+      "culebre.openstreetmap.org"
+    ]
+  }
+)
+
+run_list(
+  "role[tetaneutral]",
+  "role[tilecache]"
+)
diff --git a/roles/tetaneutral.rb b/roles/tetaneutral.rb
new file mode 100644
index 000000000..1fc9bd07f
--- /dev/null
+++ b/roles/tetaneutral.rb
@@ -0,0 +1,28 @@
+name "tetaneutral"
+description "Role applied to all servers at Tetaneutral.net"
+
+default_attributes(
+  :hosted_by => "Tetaneutral.net",
+  :location => "Toulouse, France",
+  :networking => {
+    :nameservers => [
+      "8.8.8.8",
+      "8.8.4.4"
+    ],
+    :roles => {
+      :external => {
+        :zone => "tnn"
+      }
+    }
+  }
+)
+
+override_attributes(
+  :ntp => {
+    :servers => ["0.fr.pool.ntp.org", "1.fr.pool.ntp.org", "europe.pool.ntp.org"]
+  }
+)
+
+run_list(
+  "role[fr]"
+)
-- 
2.39.5