Add role for kalessin

diff --git a/cookbooks/networking/templates/default/shorewall-zones.erb b/cookbooks/networking/templates/default/shorewall-zones.erb
index 65a7697a595d91bff3894b1d83a2a1a03d2621b8..d1875b5994c898b8b0a439b5ecff61b26decb28e 100644 (file)
--- a/cookbooks/networking/templates/default/shorewall-zones.erb
+++ b/cookbooks/networking/templates/default/shorewall-zones.erb
@@ -32,3 +32,4 @@ aws:osm               <%= @type %>
 ds:osm         <%= @type %>
 uz:osm          <%= @type %>
 ovh:osm         <%= @type %>
+ffr:osm         <%= @type %>

diff --git a/roles/ffrl.rb b/roles/ffrl.rb
new file mode 100644 (file)
index 0000000..6cd12e9
--- /dev/null
+++ b/roles/ffrl.rb
@@ -0,0 +1,24 @@
+name "ffrl"
+description "Role applied to all servers at Freifunk Rheinland"
+
+default_attributes(
+  :hosted_by => "Freifunk Rheinland",
+  :location => "Berlin, Germany",
+  :networking => {
+    :roles => {
+      :external => {
+        :zone => "ffr"
+      }
+    }
+  }
+)
+
+override_attributes(
+  :ntp => {
+    :servers => ["0.de.pool.ntp.org", "1.de.pool.ntp.org", "europe.pool.ntp.org"]
+  }
+)
+
+run_list(
+  "role[de]"
+)

diff --git a/roles/kalessin.rb b/roles/kalessin.rb
new file mode 100644 (file)
index 0000000..7112822
--- /dev/null
+++ b/roles/kalessin.rb
@@ -0,0 +1,46 @@
+name "kalessin"
+description "Master role applied to kalessin"
+
+default_attributes(
+  :networking => {
+    :interfaces => {
+      :external_ipv4 => {
+        :interface => "eth0",
+        :role => :external,
+        :family => :inet,
+        :address => "185.66.195.245",
+        :prefix => "28",
+        :gateway => "185.66.195.241"
+      },
+      :external_ipv6 => {
+        :interface => "eth0",
+        :role => :external,
+        :family => :inet6,
+        :address => "2a03:2260:2000:1::5",
+        :prefix => "64",
+        :gateway => "2a03:2260:2000:1::1"
+      }
+    }
+  },
+  :squid => {
+    :cache_mem => "12500 MB",
+    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+  },
+  :tilecache => {
+    :tile_parent => "germany.render.openstreetmap.org",
+    :tile_siblings => [
+      "konqi.openstreetmap.org",
+      "trogdor.openstreetmap.org",
+      "nepomuk.openstreetmap.org",
+      "ridgeback.openstreetmap.org",
+      "gorynych.openstreetmap.org",
+      "simurgh.openstreetmap.org"
+    ]
+  }
+)
+
+run_list(
+  "role[ffrl]",
+  "role[geodns]",
+  "role[tilecache]"
+)