X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2bfb0ef07fb64314f5c4ded641a8c280df9c1d0b..bd092fe988542b53b8c4eef223ba87c57ad546f1:/roles/ridley.rb diff --git a/roles/ridley.rb b/roles/ridley.rb index ae27c20e2..7500247f3 100644 --- a/roles/ridley.rb +++ b/roles/ridley.rb @@ -2,6 +2,11 @@ name "ridley" description "Master role applied to ridley" default_attributes( + :accounts => { + :users => { + :otrs => { :status => :role } + } + }, :apache => { :mpm => "event", :event => { @@ -12,26 +17,25 @@ default_attributes( :max_connections_per_child => 10000 } }, - :bind => { - :clients => "ucl" - }, :dhcpd => { :first_address => "10.0.15.1", :last_address => "10.0.15.254" }, :networking => { :interfaces => { - :external_ipv4 => { + :external => { :interface => "eth0.2800", :role => :external, - :family => :inet, - :address => "193.60.236.19" + :inet => { + :address => "193.60.236.19" + } }, - :internal_ipv4 => { + :internal => { :interface => "eth0.2801", :role => :internal, - :family => :inet, - :address => "10.0.0.3" + :inet => { + :address => "10.0.0.3" + } } } } @@ -43,11 +47,6 @@ run_list( "role[gateway]", "role[foundation]", "role[stateofthemap]", - "role[switch2osm]", "role[blog]", - "role[otrs]", - "role[donate]", - "recipe[hot]", - "recipe[dmca]", "recipe[dhcpd]" )