X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/5f273f1b91609cb4b5d1c1cfbd145b8f0e494202..af87a58d387f200266eb7717f15c54f2a94cc284:/roles/ridley.rb diff --git a/roles/ridley.rb b/roles/ridley.rb index b45dc3281..aee7655c9 100644 --- a/roles/ridley.rb +++ b/roles/ridley.rb @@ -2,34 +2,23 @@ name "ridley" description "Master role applied to ridley" default_attributes( - :ssl => { - :certificates => %w(osmfoundation openstreetmap) - }, :apache => { - :ssl => { - :certificate => "osmfoundation", - :certificate_chain => "startcom" + :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 => { @@ -39,55 +28,17 @@ default_attributes( :address => "193.60.236.19" }, :internal_ipv4 => { - :interface => "eth1", + :interface => "eth0.2801", :role => :internal, :family => :inet, :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" - } - } - } } ) run_list( - "role[ucl-slough]", + "role[ucl]", "role[hp-dl360-g6]", "role[gateway]", "role[foundation]", @@ -96,6 +47,8 @@ run_list( "role[blog]", "role[otrs]", "role[donate]", + "recipe[hot]", + "recipe[dmca]", "recipe[dhcpd]", - "recipe[openvpn]" + "recipe[ideditor]" )