Revert "Update ridgeback configuration for squid 3"

[chef.git] / roles / lyonix.rb

diff --git a/roles/lyonix.rb b/roles/lyonix.rb
index f7bb27a3d6568e4ecdd4a7321a32a6e9890abe2c..a5aff59e0b33853778abbada6fe3fce94d3ef8d7 100644 (file)
--- a/roles/lyonix.rb
+++ b/roles/lyonix.rb
@@ -2,13 +2,10 @@ name "lyonix"
 description "Role applied to all servers at LyonIX"
 
 default_attributes(
-  :accounts => {
-    :users => {
-      :lyonix => { :status => :administrator }
-    }
-  },
+  :hosted_by => "LyonIX",
+  :location => "Lyon, France",
   :networking => {
-    :nameservers => [ "77.95.64.205", "77.95.64.206", "8.8.8.8", "8.8.4.4" ],
+    :nameservers => ["77.95.64.205", "77.95.64.206", "8.8.8.8", "8.8.4.4"],
     :roles => {
       :external => {
         :zone => "ly"
@@ -16,7 +13,7 @@ default_attributes(
     }
   },
   :snmpd => {
-    :clients => [ "77.95.64.0/24", "77.95.70.0/24" ],
+    :clients => ["77.95.64.0/24", "77.95.70.0/24"],
     :community => "lyonix",
     :location => "LYON",
     :contact => "noc@lyonix.net"
@@ -25,7 +22,7 @@ default_attributes(
 
 override_attributes(
   :ntp => {
-    :servers => [ "0.fr.pool.ntp.org", "1.fr.pool.ntp.org", "europe.pool.ntp.org" ]
+    :servers => ["0.fr.pool.ntp.org", "1.fr.pool.ntp.org", "europe.pool.ntp.org"]
   }
 )