Download as
Browse Code »

Commit 91a1d11469e454f702a796718b74754ed3bf6fdc

Authored by Antonio Terceiro
1 parent 0190f0ad
Exists in master and in 36 other branches add_super_archives_plugin, automates_core_packing, changes_in_buttons_on_content_panel, colab_fix_automatic_group_creation_bug, gitlab-8.x, gov-user-refactoring, gov-user-refactoring-rails4, gov-user-to-organization, high_contrast, high_contrast_style, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, mezuro_spb, packaging_colab_plugins, performance, refactor_software_communities, refactor_software_communities_rails4, refactor_software_for_sisp, refactor_software_info_to_software, register_page, remove-unused-images, removing_super_archives_email, restore, signals_user_noosfero, software_as_organization, spb_minimal_env, stable-4.1, stable-4.2, stable-4.x, stable-5.0, stable-5.1, stable-devel, temp_soft_comm_refactoring, theme_header, thread_page

relay: support an external outgoing relay

Showing 2 changed files with 8 additions and 0 deletions   Show diff stats
config/homologa/config.yaml
  Diff comments   View file @91a1d11
@@ -11,5 +11,6 @@ lists_hostname: listas.homologa.softwarepublico.gov.br @@ -11,5 +11,6 @@ lists_hostname: listas.homologa.softwarepublico.gov.br
11 lists_admin: nayanne.bonifacio@planejamento.gov.br 11 lists_admin: nayanne.bonifacio@planejamento.gov.br
12 relay_hostname: relay.homologa.softwarepublico.gov.br 12 relay_hostname: relay.homologa.softwarepublico.gov.br
13 relay_ip: 189.9.151.66 13 relay_ip: 189.9.151.66
  14 +external_outgoing_mail_relay: 189.9.150.53
14 alt_ssh_port: 55555 15 alt_ssh_port: 55555
15 from_address: noreply@homologa.softwarepublico.gov.br 16 from_address: noreply@homologa.softwarepublico.gov.br
cookbooks/email/recipes/relay.rb
  Diff comments   View file @91a1d11
@@ -46,3 +46,10 @@ execute 'transport:postmap' do @@ -46,3 +46,10 @@ execute 'transport:postmap' do
46 command "postmap /etc/postfix/transport" 46 command "postmap /etc/postfix/transport"
47 action :nothing 47 action :nothing
48 end 48 end
  49 +
  50 +external_relay = node['config']['external_outgoing_mail_relay']
  51 +if external_relay
  52 + execute "postconf relayhost=#{external_relay}"
  53 +else
  54 + execute 'postconf -X relayhost'
  55 +end