X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b2e3e693bedea449c18753ab7c3be6676b72ca36..071a853199b7045f4fe496a12495c52cafad7126:/roles/shenron.rb diff --git a/roles/shenron.rb b/roles/shenron.rb index c3db86355..f91677226 100644 --- a/roles/shenron.rb +++ b/roles/shenron.rb @@ -10,59 +10,46 @@ default_attributes( } }, :hardware => { - :mcelog => { - :enabled => false + :hwmon => { + "platform_it87_552" => { + :ignore => %w[in6] + } }, :modules => [ "it87" ] }, - :openvpn => { - :address => "10.0.16.3", - :tunnels => { - :shenron2ucl => { - :port => "1194", - :mode => "server", - :peer => { - :host => "ridley.openstreetmap.org" - } - } + :prometheus => { + :metrics => { + :exim_queue_limit => { :metric => 250 } } } ) override_attributes( :networking => { + :dnssec => "false", :interfaces => { - :external_ipv4 => { - :interface => "eth0", - :role => :external, - :family => :inet, - :address => "212.110.172.32", - :prefix => "26", - :gateway => "212.110.172.1" - }, - :external_ipv6 => { + :external => { :interface => "eth0", :role => :external, - :family => :inet6, - :address => "2001:41c9:1:400::32", - :prefix => "64", - :gateway => "fe80::1" + :inet => { + :address => "212.110.172.32", + :prefix => "26", + :gateway => "212.110.172.1" + }, + :inet6 => { + :address => "2001:41c9:1:400::32", + :prefix => "64", + :gateway => "fe80::1" + } } - }, - :nameservers => ["89.16.162.20", "2001:41c9:2:d6::20"] + } } ) run_list( "role[bytemark]", - "role[mail]", "role[lists]", - "role[subversion]", - "role[trac]", - "role[osqa]", - "role[irc]", - "recipe[blogs]", - "recipe[openvpn]" + "role[osqa]" )