Merge remote-tracking branch 'github/pull/504'

[chef.git] / roles / viserion.rb

diff --git a/roles/viserion.rb b/roles/viserion.rb
index 0691db49abc24f41b5c8c88081fc2f79b8e69c63..a951929020dd9fddc68178d7182afdf5c1739264 100644 (file)
--- a/roles/viserion.rb
+++ b/roles/viserion.rb
@@ -2,6 +2,15 @@ name "viserion"
 description "Master role applied to viserion"
 
 default_attributes(
+  :accounts => {
+    :users => {
+      :anovak => { :status => :administrator }
+    }
+  },
+  :location => "Pula, Croatia",
+  :munin => {
+    :allow => ["193.198.233.210"]
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -9,7 +18,7 @@ default_attributes(
         :role => :external,
         :family => :inet,
         :address => "193.198.233.211",
-        :prefix => "27",
+        :prefix => "29",
         :gateway => "193.198.233.209"
       },
       :external_ipv6 => {
@@ -17,19 +26,10 @@ default_attributes(
         :role => :external,
         :family => :inet6,
         :address => "2001:b68:4cff:3::3",
-        :prefix => "128",
-        :gateway => "fe80::217:fff:fead:14c0"
+        :prefix => "64",
+        :gateway => "2001:b68:4cff:3::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 => "pula.render.openstreetmap.org",
-    :tile_siblings => [
-    ]
   }
 )