X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c08dfe1bf43b2f97baeb0631323256b1a13e18bf..1facaf1dc96ab5b42492334c3170e1232b2f847d:/roles/shenron.rb diff --git a/roles/shenron.rb b/roles/shenron.rb index 191c6429f..84a38aa06 100644 --- a/roles/shenron.rb +++ b/roles/shenron.rb @@ -7,20 +7,35 @@ default_attributes( :bretth => { :status => :user, :shell => "/usr/bin/git-shell" - }, + } } }, :apache => { :mpm => "event", :event => { - :max_requests_per_child => 2000 + :max_connections_per_child => 2000 } }, :hardware => { :modules => [ "it87" - ], + ] }, + :openvpn => { + :address => "10.0.16.3", + :tunnels => { + :shenron2ucl => { + :port => "1194", + :mode => "server", + :peer => { + :host => "ridley.openstreetmap.org" + } + } + } + } +) + +override_attributes( :networking => { :interfaces => { :external_ipv4 => { @@ -38,18 +53,6 @@ default_attributes( :address => "2001:41c9:1:400::32", :prefix => "64", :gateway => "fe80::1" - }, - } - }, - :openvpn => { - :address => "10.0.16.3", - :tunnels => { - :shenron2ucl => { - :port => "1194", - :mode => "server", - :peer => { - :host => "ridley.openstreetmap.org" - } } } }