From 9279ae75dbf67a19c1d7e41fc48d38a814245e68 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Wed, 31 Jul 2013 17:25:24 +0100
Subject: [PATCH 1/1] Add roles for nadder-01 and nadder-02

---
 .../templates/default/shorewall-zones.erb     |  1 +
 roles/bluehost.rb                             | 23 ++++++++++++++++
 roles/nadder-01.rb                            | 26 +++++++++++++++++++
 roles/nadder-02.rb                            | 26 +++++++++++++++++++
 4 files changed, 76 insertions(+)
 create mode 100644 roles/bluehost.rb
 create mode 100644 roles/nadder-01.rb
 create mode 100644 roles/nadder-02.rb

diff --git a/cookbooks/networking/templates/default/shorewall-zones.erb b/cookbooks/networking/templates/default/shorewall-zones.erb
index 0af666a46..47e7ee0af 100644
--- a/cookbooks/networking/templates/default/shorewall-zones.erb
+++ b/cookbooks/networking/templates/default/shorewall-zones.erb
@@ -18,3 +18,4 @@ pr:osm		<%= @type %>
 ly:osm		<%= @type %>
 ov:osm		<%= @type %>
 hz:osm		<%= @type %>
+bh:osm		<%= @type %>
diff --git a/roles/bluehost.rb b/roles/bluehost.rb
new file mode 100644
index 000000000..247fd057e
--- /dev/null
+++ b/roles/bluehost.rb
@@ -0,0 +1,23 @@
+name "bluehost"
+description "Role applied to all servers at Bluehost"
+
+default_attributes(
+  :networking => {
+    :nameservers => [ "8.8.8.8", "8.8.4.4" ],
+    :roles => {
+      :external => {
+        :zone => "bh"
+      }
+    }
+  }
+)
+
+override_attributes(
+  :ntp => {
+    :servers => [ "0.us.pool.ntp.org", "1.us.pool.ntp.org", "north-america.pool.ntp.org" ]
+  }
+)
+
+run_list(
+  "role[us]"
+)
diff --git a/roles/nadder-01.rb b/roles/nadder-01.rb
new file mode 100644
index 000000000..62e23b6dd
--- /dev/null
+++ b/roles/nadder-01.rb
@@ -0,0 +1,26 @@
+name "nadder-01"
+description "Master role applied to nadder-01"
+
+default_attributes(
+  :networking => {
+    :interfaces => {
+      :external_ipv4 => {
+        :interface => "eth0",
+        :role => :external,
+        :family => :inet,
+        :address => "192.163.219.36",
+        :prefix => "19",
+        :gateway => "192.163.192.1"
+      }
+    }
+  },
+  :squid => {
+    :cache_mem => "5500 MB",
+    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+  }
+)
+
+run_list(
+  "role[bluehost]",
+  "role[tilecache]"
+)
diff --git a/roles/nadder-02.rb b/roles/nadder-02.rb
new file mode 100644
index 000000000..606a399b1
--- /dev/null
+++ b/roles/nadder-02.rb
@@ -0,0 +1,26 @@
+name "nadder-02"
+description "Master role applied to nadder-02"
+
+default_attributes(
+  :networking => {
+    :interfaces => {
+      :external_ipv4 => {
+        :interface => "eth0",
+        :role => :external,
+        :family => :inet,
+        :address => "192.163.219.40",
+        :prefix => "19",
+        :gateway => "192.163.192.1"
+      }
+    }
+  },
+  :squid => {
+    :cache_mem => "5500 MB",
+    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+  }
+)
+
+run_list(
+  "role[bluehost]",
+  "role[tilecache]"
+)
-- 
2.39.5