From 2eb5fe3d4f9e1296bbd290669b7d1b99b1e7a8bb Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 25 Sep 2018 14:50:40 +0100
Subject: [PATCH 1/1] Add role for cherufe

---
 .../templates/default/shorewall-zones.erb     |  1 +
 roles/altavoz.rb                              | 28 +++++++++++++++
 roles/cherufe.rb                              | 35 +++++++++++++++++++
 roles/cl.rb                                   | 10 ++++++
 4 files changed, 74 insertions(+)
 create mode 100644 roles/altavoz.rb
 create mode 100644 roles/cherufe.rb
 create mode 100644 roles/cl.rb

diff --git a/cookbooks/networking/templates/default/shorewall-zones.erb b/cookbooks/networking/templates/default/shorewall-zones.erb
index ef126ade1..45fb5faf3 100644
--- a/cookbooks/networking/templates/default/shorewall-zones.erb
+++ b/cookbooks/networking/templates/default/shorewall-zones.erb
@@ -39,3 +39,4 @@ grn:osm         <%= @type %>
 g5s:osm         <%= @type %>
 na:osm          <%= @type %>
 tnn:osm         <%= @type %>
+av:osm          <%= @type %>
diff --git a/roles/altavoz.rb b/roles/altavoz.rb
new file mode 100644
index 000000000..78f671295
--- /dev/null
+++ b/roles/altavoz.rb
@@ -0,0 +1,28 @@
+name "altavoz"
+description "Role applied to all servers at AltaVoz"
+
+default_attributes(
+  :hosted_by => "AltaVoz",
+  :location => "Viña del Mar, Chile",
+  :networking => {
+    :nameservers => [
+      "200.91.44.10",
+      "200.91.41.10"
+    ],
+    :roles => {
+      :external => {
+        :zone => "av"
+      }
+    }
+  }
+)
+
+override_attributes(
+  :ntp => {
+    :servers => ["0.cl.pool.ntp.org", "1.cl.pool.ntp.org", "america.pool.ntp.org"]
+  }
+)
+
+run_list(
+  "role[cl]"
+)
diff --git a/roles/cherufe.rb b/roles/cherufe.rb
new file mode 100644
index 000000000..ebf272e46
--- /dev/null
+++ b/roles/cherufe.rb
@@ -0,0 +1,35 @@
+name "cherufe"
+description "Master role applied to cherufe"
+
+default_attributes(
+  :networking => {
+    :interfaces => {
+      :external_ipv4 => {
+        :interface => "ens18",
+        :role => :external,
+        :family => :inet,
+        :address => "200.91.44.37",
+        :prefix => "23",
+        :gateway => "200.91.44.1"
+      }
+    }
+  },
+  :squid => {
+    :cache_mem => "6000 MB",
+    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+  },
+  :tilecache => {
+    :tile_parent => "vinadelmar.render.openstreetmap.org",
+    :tile_siblings => [
+      "ascalon.openstreetmap.org",
+      "stormfly-02.openstreetmap.org",
+      "jakelong.openstreetmap.org"
+    ]
+  }
+)
+
+run_list(
+  "role[altavoz]",
+  "role[geodns]",
+  "role[tilecache]"
+)
diff --git a/roles/cl.rb b/roles/cl.rb
new file mode 100644
index 000000000..8686bd5c0
--- /dev/null
+++ b/roles/cl.rb
@@ -0,0 +1,10 @@
+name "cl"
+description "Role applied to all servers located in Chile"
+
+override_attributes(
+  :country => "cl"
+)
+
+run_list(
+  "role[base]"
+)
-- 
2.43.2