From 030d3fdee8cdceceed1df37740b6177cb978eeba Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Fri, 4 Jan 2019 10:55:12 +0000
Subject: [PATCH 1/1] Add role for norbert

---
 .../templates/default/shorewall-zones.erb     |  1 +
 roles/grifon.rb                               | 28 ++++++++++++
 roles/nepomuk.rb                              |  2 +
 roles/noomoahk.rb                             |  1 +
 roles/norbert.rb                              | 43 +++++++++++++++++++
 5 files changed, 75 insertions(+)
 create mode 100644 roles/grifon.rb
 create mode 100644 roles/norbert.rb

diff --git a/cookbooks/networking/templates/default/shorewall-zones.erb b/cookbooks/networking/templates/default/shorewall-zones.erb
index 45fb5faf3..b91e46f30 100644
--- a/cookbooks/networking/templates/default/shorewall-zones.erb
+++ b/cookbooks/networking/templates/default/shorewall-zones.erb
@@ -40,3 +40,4 @@ g5s:osm         <%= @type %>
 na:osm          <%= @type %>
 tnn:osm         <%= @type %>
 av:osm          <%= @type %>
+grf:osm         <%= @type %>
diff --git a/roles/grifon.rb b/roles/grifon.rb
new file mode 100644
index 000000000..bd830987d
--- /dev/null
+++ b/roles/grifon.rb
@@ -0,0 +1,28 @@
+name "grifon"
+description "Role applied to all servers at Grifon"
+
+default_attributes(
+  :hosted_by => "Grifon",
+  :location => "Paris, France",
+  :munin => {
+    :allow => ["2a00:5884::8"]
+  },
+  :networking => {
+    :nameservers => ["2a00:5884::7"],
+    :roles => {
+      :external => {
+        :zone => "grf"
+      }
+    }
+  }
+)
+
+override_attributes(
+  :ntp => {
+    :servers => ["0.fr.pool.ntp.org", "1.fr.pool.ntp.org", "europe.pool.ntp.org"]
+  }
+)
+
+run_list(
+  "role[fr]"
+)
diff --git a/roles/nepomuk.rb b/roles/nepomuk.rb
index b0c99c73f..362bc513a 100644
--- a/roles/nepomuk.rb
+++ b/roles/nepomuk.rb
@@ -60,6 +60,8 @@ default_attributes(
   :tilecache => {
     :tile_parent => "france.render.openstreetmap.org",
     :tile_siblings => [
+      "noomoahk.openstreetmap.org",
+      "norbert.openstreetmap.org",
       "trogdor.openstreetmap.org",
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org",
diff --git a/roles/noomoahk.rb b/roles/noomoahk.rb
index 36c1b2968..ebeea8409 100644
--- a/roles/noomoahk.rb
+++ b/roles/noomoahk.rb
@@ -30,6 +30,7 @@ default_attributes(
     :tile_parent => "france.render.openstreetmap.org",
     :tile_siblings => [
       "nepomuk.openstreetmap.org",
+      "norbert.openstreetmap.org",
       "ladon.openstreetmap.org",
       "culebre.openstreetmap.org"
     ]
diff --git a/roles/norbert.rb b/roles/norbert.rb
new file mode 100644
index 000000000..d9dcd9365
--- /dev/null
+++ b/roles/norbert.rb
@@ -0,0 +1,43 @@
+name "norbert"
+description "Master role applied to norbert"
+
+default_attributes(
+  :networking => {
+    :interfaces => {
+      :external_ipv4 => {
+        :interface => "ens18",
+        :role => :external,
+        :family => :inet,
+        :address => "89.234.186.100",
+        :prefix => "27",
+        :gateway => "89.234.186.97"
+      },
+      :external_ipv6 => {
+        :interface => "ens18",
+        :role => :external,
+        :family => :inet6,
+        :address => "2a00:5884:821c::1",
+        :prefix => "48",
+        :gateway => "fe80::204:92:100:1"
+      }
+    }
+  },
+  :squid => {
+    :cache_mem => "7500 MB",
+    :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
+  },
+  :tilecache => {
+    :tile_parent => "france.render.openstreetmap.org",
+    :tile_siblings => [
+      "noomoahk.openstreetmap.org",
+      "nepomuk.openstreetmap.org",
+      "ladon.openstreetmap.org",
+      "culebre.openstreetmap.org"
+    ]
+  }
+)
+
+run_list(
+  "role[grifon]",
+  "role[tilecache]"
+)
-- 
2.43.2