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

[chef.git] / roles / prgmr.rb

diff --git a/roles/prgmr.rb b/roles/prgmr.rb
index 96319e004f7b3f5b6208143dbd2f4c0b97447825..de7ecb2e7d84db51a6947951cd8165e3ef0029f5 100644 (file)
--- a/roles/prgmr.rb
+++ b/roles/prgmr.rb
@@ -2,19 +2,14 @@ name "prgmr"
 description "Role applied to all servers at prgmr.com"
 
 default_attributes(
-  :networking => {
-    :nameservers => [ "8.8.4.4", "65.19.174.2", "65.19.175.2" ],
-    :roles => {
-      :external => {
-        :zone => "pr"
-      }
-    }
-  }
+  :hosted_by => "prgmr.com",
+  :location => "San Francisco, California",
+  :timezone => "PST8PDT"
 )
 
 override_attributes(
   :ntp => {
-    :servers => [ "0.us.pool.ntp.org", "1.us.pool.ntp.org", "2.us.pool.ntp.org" ]
+    :servers => ["0.us.pool.ntp.org", "1.us.pool.ntp.org", "2.us.pool.ntp.org"]
   }
 )