Increase nginx keepalive settings.

[chef.git] / roles / carnet.rb

diff --git a/roles/carnet.rb b/roles/carnet.rb
index 576f33dc84baed7b76f33226c4e7d1dfe689162a..fab353fa680df20bf02b7c40eb7685e9865867e3 100644 (file)
--- a/roles/carnet.rb
+++ b/roles/carnet.rb
@@ -4,20 +4,11 @@ description "Role applied to all servers at CARNet"
 default_attributes(
   :accounts => {
     :users => {
 default_attributes(
   :accounts => {
     :users => {

-      :anovak => { :status => :administrator },

       :hbogner => { :status => :administrator }
     }
   },
       :hbogner => { :status => :administrator }
     }
   },

-  :munin => {
-    :allow => [ "193.198.233.210" ]
-  },
+  :hosted_by => "CARNet",

   :networking => {
   :networking => {

-    :nameservers => [
-      "161.53.2.66",
-      "2001:b68:ff:1::2",
-      "2001:b68:ff:2::2",
-      "2001:4860:4860::8888"
-    ],

     :roles => {
       :external => {
         :zone => "cnt"
     :roles => {
       :external => {
         :zone => "cnt"


@@ -28,7 +19,7 @@ default_attributes(
 
 override_attributes(
   :ntp => {
 
 override_attributes(
   :ntp => {

-    :servers => [ "0.hr.pool.ntp.org", "1.hr.pool.ntp.org", "europe.pool.ntp.org" ]
+    :servers => ["0.hr.pool.ntp.org", "1.hr.pool.ntp.org", "europe.pool.ntp.org"]

   }
 )
 
   }
 )