X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/59c52348248fc332f96eebee113de7bbf74addb2..35392722739e0c288786f35b49d9c0799c86321f:/roles/ridley.rb diff --git a/roles/ridley.rb b/roles/ridley.rb index d925702c8..591f31ae2 100644 --- a/roles/ridley.rb +++ b/roles/ridley.rb @@ -2,51 +2,23 @@ name "ridley" description "Master role applied to ridley" default_attributes( - :apache => { - :ssl => { - :certificate => "osmfoundation", - :certificate_chain => "startcom" - } - }, - :chef => { - :client => { - :version => "12.1.2-1" - } + :bind => { + :clients => "ucl" }, :dhcpd => { :first_address => "10.0.15.1", :last_address => "10.0.15.254" }, - :exim => { - :aliases => { - :root => "grant" - } - }, - :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 => { - :interface => "eth0", + :interface => "eth0.2800", :role => :external, :family => :inet, - :address => "128.40.45.205" + :address => "193.60.236.19" }, :internal_ipv4 => { - :interface => "eth1", + :interface => "eth0.2801", :role => :internal, :family => :inet, :address => "10.0.0.3" @@ -72,9 +44,17 @@ default_attributes( :port => "1194" } }, - :firefishy => { + :ucl2bm => { :port => "1196", :mode => "client", + :peer => { + :host => "grisu.openstreetmap.org", + :port => "1196" + } + }, + :firefishy => { + :port => "1197", + :mode => "client", :peer => { :host => "home.firefishy.com", :port => "1194", @@ -86,15 +66,17 @@ 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]", + "role[donate]", + "recipe[hot]", + "recipe[dmca]", "recipe[dhcpd]", "recipe[openvpn]" )