X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b88d6ea0fa7181ba138ef249a9a4aac0ce77c8a3..37306271bf3cec2ea3efd3f51d6da7dbc68d950a:/roles/ridley.rb diff --git a/roles/ridley.rb b/roles/ridley.rb index 999482f8e..08a97417d 100644 --- a/roles/ridley.rb +++ b/roles/ridley.rb @@ -2,84 +2,34 @@ 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 } }, :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 => { + :external => { :interface => "eth0.2800", :role => :external, - :family => :inet, - :address => "193.60.236.19" - }, - :internal_ipv4 => { - :interface => "eth0", - :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" + :inet => { + :address => "193.60.236.19" } }, - :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" + :internal => { + :interface => "eth0.2801", + :role => :internal, + :inet => { + :address => "10.0.0.3" } } } @@ -87,15 +37,12 @@ default_attributes( ) run_list( - "role[ucl-slough]", + "role[ucl]", "role[hp-dl360-g6]", "role[gateway]", "role[foundation]", "role[stateofthemap]", - "role[switch2osm]", "role[blog]", "role[otrs]", - "role[donate]", - "recipe[dhcpd]", - "recipe[openvpn]" + "recipe[dhcpd]" )