X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/37556c39822d93efe9998cf81a1a84783de3c076..186be7c4e2792c8a4f83ac6896cd18d94da5fa99:/roles/ridley.rb

diff --git a/roles/ridley.rb b/roles/ridley.rb
index 136cfd7d0..ae27c20e2 100644
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -5,11 +5,11 @@ default_attributes(
   :apache => {
     :mpm => "event",
     :event => {
-      :min_spare_threads => 50,
-      :max_spare_threads => 150,
-      :max_connections_per_child => 10000,
-      :async_request_worker_factor => 4,
-      :listen_cores_buckets_ratio => 4
+      :start_servers => 12,
+      :server_limit => 48,
+      :min_spare_threads => 25,
+      :max_spare_threads => 75,
+      :max_connections_per_child => 10000
     }
   },
   :bind => {
@@ -34,44 +34,6 @@ default_attributes(
         :address => "10.0.0.3"
       }
     }
-  },
-  :openvpn => {
-    :address => "10.0.16.1",
-    :tunnels => {
-      :ic2ucl => {
-        :port => "1194",
-        :mode => "client",
-        :peer => {
-          :host => "ironbelly.openstreetmap.org",
-          :port => "1194"
-        }
-      },
-      :shenron2ucl => {
-        :port => "1195",
-        :mode => "client",
-        :peer => {
-          :host => "shenron.openstreetmap.org",
-          :port => "1194"
-        }
-      },
-      :ucl2bm => {
-        :port => "1196",
-        :mode => "client",
-        :peer => {
-          :host => "grisu.openstreetmap.org",
-          :port => "1196"
-        }
-      },
-      :firefishy => {
-        :port => "1197",
-        :mode => "client",
-        :peer => {
-          :host => "home.firefishy.com",
-          :port => "1194",
-          :address => "10.0.16.201"
-        }
-      }
-    }
   }
 )
 
@@ -87,6 +49,5 @@ run_list(
   "role[donate]",
   "recipe[hot]",
   "recipe[dmca]",
-  "recipe[dhcpd]",
-  "recipe[openvpn]"
+  "recipe[dhcpd]"
 )