Drop outgoing mail overrides that are no longer needed

diff --git a/roles/community.rb b/roles/community.rb
index b482cfce0ebc3297b7aaf0339c01c4c986866153..c24e40fbbe80ac01902647787d8a33e187ffd393 100644 (file)
--- a/roles/community.rb
+++ b/roles/community.rb
@@ -9,9 +9,6 @@ default_attributes(
         :members => [:grant, :tomh]
       }
     }
         :members => [:grant, :tomh]
       }
     }

-  },
-  :exim => {
-    :smarthost_via => "fafnir.openstreetmap.org:26"

   }
 )
 
   }
 )
 

diff --git a/roles/dev.rb b/roles/dev.rb
index 18e0edfcf279fbf63a1f05f4b87f464bb050ec19..e048537fa96652c790873932febe4fb86b242ccb 100644 (file)
--- 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 => {
   :postgresql => {
     :versions => ["14"],
     :settings => {

diff --git a/roles/fafnir.rb b/roles/fafnir.rb
index 8261d7afda3d531468abf8812e54b32852259571..6a77bf6e140f7ea166d9a24ca0c39a7a42ffb856 100644 (file)
--- a/roles/fafnir.rb
+++ b/roles/fafnir.rb
@@ -10,7 +10,6 @@ default_attributes(
     :last_address => "10.0.79.254"
   },
   :exim => {
     :last_address => "10.0.79.254"
   },
   :exim => {

-    :smarthost_name => "fafnir.openstreetmap.org",

     :routes => {
       :openstreetmap => {
         :comment => "openstreetmap.org",
     :routes => {
       :openstreetmap => {
         :comment => "openstreetmap.org",

diff --git a/roles/otrs.rb b/roles/otrs.rb
index 7355e664ef3b1e2bf13ca2137bbfadccd0d3889e..94d4c4cd291120f93af8a57d10d26c5ee2a9112f 100644 (file)
--- a/roles/otrs.rb
+++ b/roles/otrs.rb
@@ -3,7 +3,6 @@ description "Role applied to all OTRS servers"
 
 default_attributes(
   :exim => {
 
 default_attributes(
   :exim => {

-    :smarthost_via => "fafnir.openstreetmap.org:26",

     :local_domains => ["otrs.openstreetmap.org"],
     :routes => {
       :otrs_otrs => {
     :local_domains => ["otrs.openstreetmap.org"],
     :routes => {
       :otrs_otrs => {

diff --git a/roles/wiki.rb b/roles/wiki.rb
index b7243e2934d6625d74d67362f580f62c2c68e6fd..7c4bf63802483c31ef58ce8d266eb042ed6521a7 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -24,7 +24,6 @@ default_attributes(
     }
   },
   :exim => {
     }
   },
   :exim => {

-    :smarthost_via => "fafnir.openstreetmap.org:26",

     :trusted_users => %w[www-data wiki],
     :aliases => {
       :root => "grant"
     :trusted_users => %w[www-data wiki],
     :aliases => {
       :root => "grant"