Switch UCL machines to use the UCL ntp servers

[chef.git] / roles / planet.rb

diff --git a/roles/planet.rb b/roles/planet.rb
index ad9a7301ff2d5c16d307c9e0031f2e9972f9d9b2..6c765845bb7f4893bfba6f900383638c76e2cfbf 100644 (file)
--- a/roles/planet.rb
+++ b/roles/planet.rb
@@ -7,7 +7,7 @@ default_attributes(
       :bretth => { :status => :user },
       :planet => {
         :status => :administrator,
       :bretth => { :status => :user },
       :planet => {
         :status => :administrator,

-        :members => [ :bretth ]
+        :members => [:bretth]

       }
     }
   },
       }
     }
   },


@@ -22,27 +22,35 @@ default_attributes(
         :uid => "nobody",
         :gid => "nogroup",
         :transfer_logging => false,
         :uid => "nobody",
         :gid => "nogroup",
         :transfer_logging => false,

-        :exclude => [ ".*" ],
+        :exclude => [".*"],

         :max_connections => 10,
         :ignore_errors => true,
         :ignore_nonreadable => true,
         :timeout => 3600,
         :max_connections => 10,
         :ignore_errors => true,
         :ignore_nonreadable => true,
         :timeout => 3600,

-        :refuse_options => [ "checksum" ]
+        :refuse_options => ["checksum"]

       }
     }
   },
       }
     }
   },

+  :networking => {
+    :firewall => {
+      :http_connection_limit => 10
+    }
+  },

   :apache => {
   :apache => {

-    :mpm => "event",
-    :keepalive => false,
-    :event => {
+    :mpm => "worker",
+    :keepalive => true,
+    :worker => {

       :server_limit => 20,
       :server_limit => 20,

-      :max_clients => 1000,
-      :threads_per_child => 50
+      :max_request_workers => 1000,
+      :threads_per_child => 50,
+      :min_spare_threads => 75,
+      :max_spare_threads => 525

     }
   }
 )
 
 run_list(
     }
   }
 )
 
 run_list(

+  "role[web-db]",

   "recipe[planet]",
   "recipe[planet::replication]",
   "recipe[nfs::server]",
   "recipe[planet]",
   "recipe[planet::replication]",
   "recipe[nfs::server]",