X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a7d96c8358a00088b485fadb5966eb4b231d2ff1..e3ca5c6e8ee819019a779fb20bcae0c0f08a1471:/roles/shenron.rb?ds=sidebyside diff --git a/roles/shenron.rb b/roles/shenron.rb index ef75b6015..76e0399f7 100644 --- a/roles/shenron.rb +++ b/roles/shenron.rb @@ -5,40 +5,48 @@ default_attributes( :apache => { :mpm => "event", :event => { - :max_requests_per_child => 2000 + :min_spare_threads => 50, + :max_spare_threads => 150 } }, + :hardware => { + :hwmon => { + "platform_it87_552" => { + :ignore => %w[in6] + } + }, + :mcelog => { + :enabled => false + }, + :modules => [ + "it87" + ] + } +) + +override_attributes( :networking => { + :dnssec => "false", :interfaces => { :external_ipv4 => { :interface => "eth0", :role => :external, :family => :inet, - :address => "89.16.179.150", + :address => "212.110.172.32", :prefix => "26", - :gateway => "89.16.179.129" + :gateway => "212.110.172.1" }, :external_ipv6 => { :interface => "eth0", :role => :external, :family => :inet6, - :address => "2001:41c8:0010:0996:21d:7dff:fec3:df70", + :address => "2001:41c9:1:400::32", :prefix => "64", :gateway => "fe80::1" - }, - } - }, - :openvpn => { - :address => "10.0.16.3", - :tunnels => { - :shenron2ucl => { - :port => "1194", - :mode => "server", - :peer => { - :host => "ridley.openstreetmap.org" - } } - } + }, + :nameservers => ["1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001"], + :private_address => "10.0.16.100" } ) @@ -46,13 +54,9 @@ 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[openvpn]" + "recipe[blogs]" )