X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/3a4b1c2078cd515e93a5f1bf8967f380fbd1646f..414079c5747f105c0df41b10757a779485909f09:/roles/shenron.rb diff --git a/roles/shenron.rb b/roles/shenron.rb index 51d697e88..d6e8ff9c5 100644 --- a/roles/shenron.rb +++ b/roles/shenron.rb @@ -13,7 +13,8 @@ default_attributes( :apache => { :mpm => "event", :event => { - :max_requests_per_child => 2000 + :min_spare_threads => 50, + :max_spare_threads => 150 } }, :hardware => { @@ -21,6 +22,21 @@ default_attributes( "it87" ] }, + :openvpn => { + :address => "10.0.16.3", + :tunnels => { + :shenron2ucl => { + :port => "1194", + :mode => "server", + :peer => { + :host => "ridley.openstreetmap.org" + } + } + } + } +) + +override_attributes( :networking => { :interfaces => { :external_ipv4 => { @@ -40,18 +56,6 @@ default_attributes( :gateway => "fe80::1" } } - }, - :openvpn => { - :address => "10.0.16.3", - :tunnels => { - :shenron2ucl => { - :port => "1194", - :mode => "server", - :peer => { - :host => "ridley.openstreetmap.org" - } - } - } } )