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

[chef.git] / roles / aarnet.rb

diff --git a/roles/aarnet.rb b/roles/aarnet.rb
index c8d84f858b6db8ff14775d94bde94079d5ab21fb..8cab0ea355ed9202539fe48635a22a77c164e0c6 100644 (file)
--- a/roles/aarnet.rb
+++ b/roles/aarnet.rb
@@ -2,12 +2,23 @@ name "aarnet"
 description "Role applied to all servers at AARNet"
 
 default_attributes(
 description "Role applied to all servers at AARNet"
 
 default_attributes(

-  :hosted_by => "AARNet"
+  :accounts => {
+    :users => {
+      :chm => { :status => :administrator },
+      :bclifford => { :status => :administrator }
+    }
+  },
+  :hosted_by => "AARNet",
+  :location => "Carlton, Victoria, Australia",
+  :timezone => "Australia/Melbourne"

 )
 
 override_attributes(
 )
 
 override_attributes(

+  :networking => {
+    :nameservers => ["202.158.207.1", "202.158.207.2"]
+  },

   :ntp => {
   :ntp => {

-    :servers => ["0.au.pool.ntp.org", "1.au.pool.ntp.org", "europe.pool.ntp.org"]
+    :servers => ["0.au.pool.ntp.org", "1.au.pool.ntp.org", "oceania.pool.ntp.org"]

   }
 )
 
   }
 )