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

[chef.git] / roles / paulla.rb

diff --git a/roles/paulla.rb b/roles/paulla.rb
index 91099f94d2b280ef3e56de476a22dbb1bed1b13b..db4252d5d6d0cbfaa5724447597824a9c1c8ecca 100644 (file)
--- a/roles/paulla.rb
+++ b/roles/paulla.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 name "paulla"
 description "Role applied to all servers at PauLLA"
 
@@ -8,11 +9,13 @@ default_attributes(
       :jpcw => { :status => :administrator }
     }
   },
+  :hosted_by => "Université de Pau et des Pays de l'Adour",
+  :location => "Pau, France",
   :munin => {
-    :allow => [ "10.64.1.11" ]
+    :allow => ["10.64.1.11"]
   },
   :networking => {
-    :nameservers => [ "10.64.1.3", "194.167.156.13" ],
+    :nameservers => ["10.64.1.42", "194.167.156.13", "10.64.1.3"],
     :roles => {
       :external => {
         :zone => "pa"
@@ -23,7 +26,7 @@ default_attributes(
 
 override_attributes(
   :ntp => {
-    :servers => [ "cannelle.paulla.asso.fr" ]
+    :servers => ["cannelle.paulla.asso.fr"]
   }
 )