Don't reject on an error from zen.spamhaus.org

[chef.git] / roles / umu.rb

diff --git a/roles/umu.rb b/roles/umu.rb
index 4ed9a2481d5892320a2ecd1dfa090629d1b9b7bb..9e783264dfb98f059d29a63a0a71ee3c59f78c3b 100644 (file)
--- a/roles/umu.rb
+++ b/roles/umu.rb
@@ -2,19 +2,19 @@ name "umu"
 description "Role applied to all servers at Umeå University"
 
 default_attributes(
-  :hosted_by => "Academic Computer Club, Umeå University",
-  :location => "Umeå, Sweden",
-  :networking => {
-    :nameservers => ["130.239.18.251", "130.239.18.252", "130.239.1.90"],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
+  :accounts => {
+    :users => {
+      :maswan => { :status => :administrator }
     }
-  }
+  },
+  :hosted_by => "Academic Computer Club, Umeå University",
+  :location => "Umeå, Sweden"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["130.239.18.251", "130.239.18.252", "130.239.1.90"]
+  },
   :ntp => {
     :servers => ["0.se.pool.ntp.org", "1.se.pool.ntp.org", "europe.pool.ntp.org"]
   }