From 91a1d11469e454f702a796718b74754ed3bf6fdc Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Thu, 21 May 2015 17:13:02 -0300 Subject: [PATCH] relay: support an external outgoing relay --- config/homologa/config.yaml | 1 + cookbooks/email/recipes/relay.rb | 7 +++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/config/homologa/config.yaml b/config/homologa/config.yaml index f1aa91e..437a16d 100644 --- a/config/homologa/config.yaml +++ b/config/homologa/config.yaml @@ -11,5 +11,6 @@ lists_hostname: listas.homologa.softwarepublico.gov.br lists_admin: nayanne.bonifacio@planejamento.gov.br relay_hostname: relay.homologa.softwarepublico.gov.br relay_ip: 189.9.151.66 +external_outgoing_mail_relay: 189.9.150.53 alt_ssh_port: 55555 from_address: noreply@homologa.softwarepublico.gov.br diff --git a/cookbooks/email/recipes/relay.rb b/cookbooks/email/recipes/relay.rb index cd74f66..08e2bc6 100644 --- a/cookbooks/email/recipes/relay.rb +++ b/cookbooks/email/recipes/relay.rb @@ -46,3 +46,10 @@ execute 'transport:postmap' do command "postmap /etc/postfix/transport" action :nothing end + +external_relay = node['config']['external_outgoing_mail_relay'] +if external_relay + execute "postconf relayhost=#{external_relay}" +else + execute 'postconf -X relayhost' +end -- libgit2 0.21.2