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

[chef.git] / roles / teleservice.rb

diff --git a/roles/teleservice.rb b/roles/teleservice.rb
index 49f98d4b2a325a981ce0cbbf14c6450d860d12a8..70e0e5bde881a2779a8af726e491520b0465f42e 100644 (file)
--- a/roles/teleservice.rb
+++ b/roles/teleservice.rb
@@ -1,9 +1,12 @@
+# coding: utf-8
 name "teleservice"
 description "Role applied to all servers at Teleservice"
 
 default_attributes(
+  :hosted_by => "Teleservice Skåne AB",
+  :location => "Sjöbo, Sweden",
   :networking => {
-    :nameservers => [ "8.8.8.8", "8.8.4.4" ],
+    :nameservers => ["8.8.8.8", "8.8.4.4"],
     :roles => {
       :external => {
         :zone => "ts"
@@ -14,7 +17,7 @@ default_attributes(
 
 override_attributes(
   :ntp => {
-    :servers => [ "0.se.pool.ntp.org", "1.se.pool.ntp.org", "europe.pool.ntp.org" ]
+    :servers => ["0.se.pool.ntp.org", "1.se.pool.ntp.org", "europe.pool.ntp.org"]
   }
 )