X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/09634082d97723b3f43788db837163607603142f..f71332c2b37903d5abf1e71637a022df17bb3afc:/roles/ridley.rb?ds=sidebyside diff --git a/roles/ridley.rb b/roles/ridley.rb index db468a489..591f31ae2 100644 --- a/roles/ridley.rb +++ b/roles/ridley.rb @@ -2,44 +2,23 @@ name "ridley" description "Master role applied to ridley" default_attributes( - :ssl => { - :certificates => ["osmfoundation", "openstreetmap"] - }, - :apache => { - :ssl => { - :certificate => "osmfoundation", - :certificate_chain => "startcom" - } + :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 => { - :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" @@ -87,7 +66,7 @@ default_attributes( ) run_list( - "role[ucl-wolfson]", + "role[ucl]", "role[hp-dl360-g6]", "role[gateway]", "role[foundation]", @@ -96,6 +75,8 @@ run_list( "role[blog]", "role[otrs]", "role[donate]", + "recipe[hot]", + "recipe[dmca]", "recipe[dhcpd]", "recipe[openvpn]" )