Add host name to munin email subject

[chef.git] / roles / stormfly-02.rb

diff --git a/roles/stormfly-02.rb b/roles/stormfly-02.rb
index 579874d2214df226ef1978a0ac7d94abb92b7df2..9108f694dd8ef7544fadc63d3e5c1f5b2f7a680b 100644 (file)
--- a/roles/stormfly-02.rb
+++ b/roles/stormfly-02.rb
@@ -4,16 +4,32 @@ description "Master role applied to stormfly-02"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
-        :interface => "eth0",
-        :role => :internal,
+      :external_ipv4 => {
+        :interface => "em1",
+        :role => :external,
         :family => :inet,
-        :address => "10.0.0.108"
+        :address => "140.211.167.105"
       }
     }
+  },
+  :squid => {
+    :cache_mem => "21000 MB",
+    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+  },
+  :tilecache => {
+    :tile_parent => "corvallis.render.openstreetmap.org",
+    :tile_siblings => [
+      "nadder-01.openstreetmap.org",
+      "nadder-02.openstreetmap.org",
+      "jakelong.openstreetmap.org",
+      "nepomuk.openstreetmap.org",
+      "lurien.openstreetmap.org"
+    ]
   }
 )
 
 run_list(
-  "role[osuosl]"
+  "role[osuosl]",
+  "role[hp-g6]",
+  "role[tilecache]"
 )