Merge remote-tracking branch 'github/pull/358' into master

[chef.git] / roles / hostedinnz.rb

diff --git a/roles/hostedinnz.rb b/roles/hostedinnz.rb
index 40eaba9cc8c7b16a1b236d63809cda21a30a9acd..9bf94140481f228b14f29c6bcb8a5273593b20ff 100644 (file)
--- a/roles/hostedinnz.rb
+++ b/roles/hostedinnz.rb
@@ -2,17 +2,15 @@ name "hostedinnz"
 description "Role applied to all servers at HostedIn.NZ"
 
 default_attributes(
 description "Role applied to all servers at HostedIn.NZ"
 
 default_attributes(

-  :hosted_by => "HostedIn.NZ",
-  :location => "Wellington, New Zealand",
-  :networking => {
-    :nameservers => ["8.8.8.8", "8.8.4.4"],
-    :roles => {
-      :external => {
-        :zone => "osm"
-      }
+  :accounts => {
+    :users => {
+      :asmith => { :status => :administrator }

     }
   },
     }
   },

+  :hosted_by => "HostedIn.NZ",
+  :location => "Wellington, New Zealand",

   :snmpd => {
   :snmpd => {

+    :clients => ["103.106.66.28"],

     :community => "hostedinnz",
     :location => "Wellington"
   }
     :community => "hostedinnz",
     :location => "Wellington"
   }


@@ -20,7 +18,7 @@ default_attributes(
 
 override_attributes(
   :ntp => {
 
 override_attributes(
   :ntp => {

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

   }
 )
 
   }
 )