X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c52b1bc996300d8fd3044532b701edaeca1482eb..c1fa3b8ab16ee50ccb201038cf7ea675c23113a3:/roles/ridley.rb diff --git a/roles/ridley.rb b/roles/ridley.rb index f9ec9ebc7..ae27c20e2 100644 --- a/roles/ridley.rb +++ b/roles/ridley.rb @@ -2,25 +2,23 @@ name "ridley" description "Master role applied to ridley" default_attributes( + :apache => { + :mpm => "event", + :event => { + :start_servers => 12, + :server_limit => 48, + :min_spare_threads => 25, + :max_spare_threads => 75, + :max_connections_per_child => 10000 + } + }, + :bind => { + :clients => "ucl" + }, :dhcpd => { :first_address => "10.0.15.1", :last_address => "10.0.15.254" }, - :munin => { - :graphs => { - :apcpdu_ucl => { - :title => "Current for UCL", - :vlabel => "Amps", - :category => "Ups", - :values => { - :load => { - :sum => ["apcpdu_apc1.load", "apcpdu_apc2.load", "apcpdu_apc3.load"], - :label => "Load" - } - } - } - } - }, :networking => { :interfaces => { :external_ipv4 => { @@ -36,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 +47,7 @@ run_list( "role[blog]", "role[otrs]", "role[donate]", - "recipe[dhcpd]", - "recipe[openvpn]" + "recipe[hot]", + "recipe[dmca]", + "recipe[dhcpd]" )