Allow all mail relays to relay from any host

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index 30617cc8e3da18a4877fba292dae0353ef52dd19..8c61b2da14393b005986008a169b72940e52de50 100644 (file)
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -85,7 +85,7 @@ end
 relay_from_hosts = node[:exim][:relay_from_hosts]
 
 if node[:exim][:smarthost_name]
-  search(:node, "exim_smarthost_via:#{node[:exim][:smarthost_name]}\\:*").each do |host|
+  search(:node, "exim_smarthost_via:*?").each do |host|
     relay_from_hosts |= host.ipaddresses(:role => :external)
   end
 

diff --git a/roles/mail.rb b/roles/mail.rb
index 9e3f9bdc907e190344817a8e9e47537c76d78de7..a96a200a86e3a8f8e2400ce05a50b17e1a997f07 100644 (file)
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -29,7 +29,7 @@ default_attributes(
     :queue_run_max => 25,
     :smtp_accept_max => 200,
     :smarthost_name => "mail.openstreetmap.org",
-    :smarthost_via => false,
+    :smarthost_via => nil,
     :dns_blacklists => ["zen.spamhaus.org!&0.255.255.0"],
     :routes => {
       :messages => {