Bump cookstyle from 6.20.1 to 6.20.2

[chef.git] / roles / lysator.rb

diff --git a/roles/lysator.rb b/roles/lysator.rb
index ad1f0087f909145c48d0c3657a18a5e6112e41bd..09c2aaff7e588471b218f4677f44aab6c7216947 100644 (file)
--- a/roles/lysator.rb
+++ b/roles/lysator.rb
@@ -2,19 +2,20 @@ name "lysator"
 description "Role applied to all servers at Lysator"
 
 default_attributes(
-  :hosted_by => "Lysator",
-  :location => "Linköping, Sweden",
-  :networking => {
-    :nameservers => ["130.236.254.225", "2001:6b0:17:f0a0::e1"],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
+  :accounts => {
+    :users => {
+      :aoh => { :status => :administrator },
+      :lysroot => { :status => :administrator }
     }
-  }
+  },
+  :hosted_by => "Lysator",
+  :location => "Linköping, Sweden"
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["130.236.254.225", "2001:6b0:17:f0a0::e1", "130.236.254.4"]
+  },
   :ntp => {
     :servers => ["0.se.pool.ntp.org", "1.se.pool.ntp.org", "europe.pool.ntp.org"]
   }