consolidate settings for nominatim machines

[chef.git] / roles / lyonix.rb

diff --git a/roles/lyonix.rb b/roles/lyonix.rb
index c19b0339e7208c197b20740a36fa7c3e02dab862..b44835628a604878f925deac9b6b82ec066cd6a4 100644 (file)
--- a/roles/lyonix.rb
+++ b/roles/lyonix.rb
@@ -2,24 +2,14 @@ name "lyonix"
 description "Role applied to all servers at LyonIX"
 
 default_attributes(
-  :accounts => {
-    :users => {
-      :lyonix => { :status => :administrator }
-    }
-  },
-  :networking => {
-    :nameservers => ["77.95.64.205", "77.95.64.206", "8.8.8.8", "8.8.4.4"],
-    :roles => {
-      :external => {
-        :zone => "ly"
-      }
-    }
-  },
+  :hosted_by => "LyonIX",
+  :location => "Lyon, France",
   :snmpd => {
-    :clients => ["77.95.64.0/24", "77.95.70.0/24"],
+    :clients => ["77.95.64.0/21"],
+    :clients6 => ["2a03:9180::/32", "2001:7f8:47::/48"],
     :community => "lyonix",
     :location => "LYON",
-    :contact => "noc@lyonix.net"
+    :contact => "sysadm@rezopole.net"
   }
 )