From 5250ae5ea1263e0ea8ef4642cf63bd808ef0c0e6 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 18 Jan 2023 20:22:23 +0000 Subject: [PATCH] Drop outgoing mail overrides that are no longer needed --- roles/community.rb | 3 --- roles/dev.rb | 3 --- roles/fafnir.rb | 1 - roles/otrs.rb | 1 - roles/wiki.rb | 1 - 5 files changed, 9 deletions(-) diff --git a/roles/community.rb b/roles/community.rb index b482cfce0..c24e40fbb 100644 --- a/roles/community.rb +++ b/roles/community.rb @@ -9,9 +9,6 @@ default_attributes( :members => [:grant, :tomh] } } - }, - :exim => { - :smarthost_via => "fafnir.openstreetmap.org:26" } ) diff --git a/roles/dev.rb b/roles/dev.rb index 18e0edfcf..e048537fa 100644 --- a/roles/dev.rb +++ b/roles/dev.rb @@ -126,9 +126,6 @@ default_attributes( } } }, - :exim => { - :smarthost_via => "fafnir.openstreetmap.org:26" - }, :postgresql => { :versions => ["14"], :settings => { diff --git a/roles/fafnir.rb b/roles/fafnir.rb index 8261d7afd..6a77bf6e1 100644 --- a/roles/fafnir.rb +++ b/roles/fafnir.rb @@ -10,7 +10,6 @@ default_attributes( :last_address => "10.0.79.254" }, :exim => { - :smarthost_name => "fafnir.openstreetmap.org", :routes => { :openstreetmap => { :comment => "openstreetmap.org", diff --git a/roles/otrs.rb b/roles/otrs.rb index 7355e664e..94d4c4cd2 100644 --- a/roles/otrs.rb +++ b/roles/otrs.rb @@ -3,7 +3,6 @@ description "Role applied to all OTRS servers" default_attributes( :exim => { - :smarthost_via => "fafnir.openstreetmap.org:26", :local_domains => ["otrs.openstreetmap.org"], :routes => { :otrs_otrs => { diff --git a/roles/wiki.rb b/roles/wiki.rb index b7243e293..7c4bf6380 100644 --- a/roles/wiki.rb +++ b/roles/wiki.rb @@ -24,7 +24,6 @@ default_attributes( } }, :exim => { - :smarthost_via => "fafnir.openstreetmap.org:26", :trusted_users => %w[www-data wiki], :aliases => { :root => "grant" -- 2.43.2