X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3a4b1c2078cd515e93a5f1bf8967f380fbd1646f..561e7914a6ed4d38c636e61457a1e49cc7d4052e:/roles/ridley.rb diff --git a/roles/ridley.rb b/roles/ridley.rb index 9a1093fb2..7500247f3 100644 --- a/roles/ridley.rb +++ b/roles/ridley.rb @@ -2,72 +2,39 @@ name "ridley" description "Master role applied to ridley" default_attributes( - :dhcpd => { - :first_address => "10.0.15.1", - :last_address => "10.0.15.254" - }, - :exim => { - :aliases => { - :root => "grant" + :accounts => { + :users => { + :otrs => { :status => :role } } }, - :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" - } - } - } + :apache => { + :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" + }, :networking => { :interfaces => { - :external_ipv4 => { - :interface => "eth0", + :external => { + :interface => "eth0.2800", :role => :external, - :family => :inet, - :address => "128.40.45.205" - }, - :internal_ipv4 => { - :interface => "eth1", - :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" } }, - :firefishy => { - :port => "1196", - :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" } } } @@ -75,15 +42,11 @@ default_attributes( ) run_list( - "role[ucl-wolfson]", - "role[hp-g6]", + "role[ucl]", + "role[hp-dl360-g6]", "role[gateway]", "role[foundation]", "role[stateofthemap]", - "role[switch2osm]", "role[blog]", - "role[otrs]", - "role[thinkup]", - "recipe[dhcpd]", - "recipe[openvpn]" + "recipe[dhcpd]" )