X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7013f21316fbdc86a8a36c7aea7f908878db6ef7..a0991185ab94cc58dfa40c724410dfd549648d91:/roles/shenron.rb diff --git a/roles/shenron.rb b/roles/shenron.rb index 9323c23ce..c3db86355 100644 --- a/roles/shenron.rb +++ b/roles/shenron.rb @@ -2,25 +2,36 @@ name "shenron" description "Master role applied to shenron" default_attributes( - :accounts => { - :users => { - :bretth => { - :status => :user, - :shell => "/usr/bin/git-shell" - } - } - }, :apache => { :mpm => "event", :event => { - :max_connections_per_child => 2000 + :min_spare_threads => 50, + :max_spare_threads => 150 } }, :hardware => { + :mcelog => { + :enabled => false + }, :modules => [ "it87" ] }, + :openvpn => { + :address => "10.0.16.3", + :tunnels => { + :shenron2ucl => { + :port => "1194", + :mode => "server", + :peer => { + :host => "ridley.openstreetmap.org" + } + } + } + } +) + +override_attributes( :networking => { :interfaces => { :external_ipv4 => { @@ -39,19 +50,8 @@ default_attributes( :prefix => "64", :gateway => "fe80::1" } - } - }, - :openvpn => { - :address => "10.0.16.3", - :tunnels => { - :shenron2ucl => { - :port => "1194", - :mode => "server", - :peer => { - :host => "ridley.openstreetmap.org" - } - } - } + }, + :nameservers => ["89.16.162.20", "2001:41c9:2:d6::20"] } ) @@ -59,13 +59,10 @@ run_list( "role[bytemark]", "role[mail]", "role[lists]", - "role[git]", "role[subversion]", "role[trac]", "role[osqa]", "role[irc]", - "role[dns]", - "role[geodns]", - "role[chef-repository]", + "recipe[blogs]", "recipe[openvpn]" )