X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8e86bcdcde5541c466540d6a9f908b17fc9c4884..f796dda7c7f5b3eb0734e1953e139646cb098f18:/roles/mail.rb?ds=sidebyside diff --git a/roles/mail.rb b/roles/mail.rb index 6cf895493..52c993568 100644 --- a/roles/mail.rb +++ b/roles/mail.rb @@ -47,7 +47,7 @@ default_attributes( :otrs => { :comment => "otrs.openstreetmap.org", :domains => ["otrs.openstreetmap.org"], - :host => "ridley.ucl.openstreetmap.org" + :host => "naga.dub.openstreetmap.org" }, :join => { :comment => "join.osmfoundation.org", @@ -62,7 +62,7 @@ default_attributes( :community => { :comment => "community.openstreetmap.org", :domains => ["community.openstreetmap.org"], - :host => "jakelong.dub.openstreetmap.org::2500" + :host => "fume.dub.openstreetmap.org::2500" } }, :dkim_selectors => { @@ -76,7 +76,6 @@ default_attributes( "clamav" => "root", "rails" => "root", "trac" => "root", - "munin" => "root", "prometheus" => "root", "www-data" => "root", "osmbackup" => "root", @@ -98,16 +97,6 @@ default_attributes( }, :private_aliases => "mail" }, - :munin => { - :plugins => { - :exim_mailqueue => { - :mails => { - :warning => 500, - :critical => 1000 - } - } - } - }, :prometheus => { :metrics => { :exim_queue_limit => { :metric => 2500 }