X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/5f273f1b91609cb4b5d1c1cfbd145b8f0e494202..63694bbb3acd7dc65ed20ab2ab7a1aa0c2cea4b2:/roles/ridley.rb?ds=sidebyside diff --git a/roles/ridley.rb b/roles/ridley.rb index b45dc3281..3d742bf5f 100644 --- a/roles/ridley.rb +++ b/roles/ridley.rb @@ -2,15 +2,6 @@ name "ridley" description "Master role applied to ridley" default_attributes( - :ssl => { - :certificates => %w(osmfoundation openstreetmap) - }, - :apache => { - :ssl => { - :certificate => "osmfoundation", - :certificate_chain => "startcom" - } - }, :dhcpd => { :first_address => "10.0.15.1", :last_address => "10.0.15.254" @@ -39,7 +30,7 @@ default_attributes( :address => "193.60.236.19" }, :internal_ipv4 => { - :interface => "eth1", + :interface => "eth0.2801", :role => :internal, :family => :inet, :address => "10.0.0.3" @@ -87,7 +78,7 @@ default_attributes( ) run_list( - "role[ucl-slough]", + "role[ucl]", "role[hp-dl360-g6]", "role[gateway]", "role[foundation]", @@ -96,6 +87,7 @@ run_list( "role[blog]", "role[otrs]", "role[donate]", + "recipe[hot]", "recipe[dhcpd]", "recipe[openvpn]" )