Unverified Commit 00961bd5 authored by Kenyon Ralph's avatar Kenyon Ralph Committed by GitHub
Browse files

Merge pull request #467 from vchepkov/smtp_fallback_relay 

Use smtp_fallback_relay in master.cf templates
parents 0baf58b5 7751dbbd

spec/classes/postfix_spec.rb

+1 −0
Changes for spec/classes/postfix_spec.rb: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ describe 'postfix' do 
        it { is_expected.to contain_augeas("manage postfix 'myorigin'").with_changes("set myorigin 'foo.example.com'") }

        it { is_expected.to contain_augeas("manage postfix 'inet_interfaces'").with_changes("set inet_interfaces 'all'") }

        it { is_expected.to contain_augeas("manage postfix 'inet_protocols'").with_changes("set inet_protocols 'all'") }

        it { is_expected.to contain_file(postfix_master_cf_path).without_content(%r{-o fallback_relay=}) }



        context 'when on Debian family', if: facts[:os]['family'] == 'Debian' do # rubocop:disable RSpec/MultipleMemoizedHelpers

          it { is_expected.to contain_package('mailx') }

templates/master.cf.Solaris.erb

+2 −2
Changes for templates/master.cf.Solaris.erb: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -45,9 +45,9 @@ verify unix - - <%= @jail %> - 1 verify 
flush     unix  n       -       <%= @jail %>       1000?   0       flush

proxymap  unix  -       -       n       -       -       proxymap

smtp      unix  -       -       <%= @jail %>       -       -       smtp

# When relaying mail as backup MX, disable fallback_relay to avoid MX loops

# When relaying mail as backup MX, disable smtp_fallback_relay to avoid MX loops

relay     unix  -       -       <%= @jail %>       -       -       smtp

	-o fallback_relay=

	-o smtp_fallback_relay=

#       -o smtp_helo_timeout=5 -o smtp_connect_timeout=5

showq     unix  n       -       <%= @jail %>       -       -       showq

error     unix  -       -       <%= @jail %>       -       -       error

templates/master.cf.debian.erb

+2 −2
Changes for templates/master.cf.debian.erb: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -45,9 +45,9 @@ flush unix n - <%= @jail %> 1000? 0 flush 
proxymap  unix  -       -       n       -       -       proxymap

proxywrite unix -       -       n       -       1       proxymap

smtp      unix  -       -       <%= @jail %>       -       -       smtp

# When relaying mail as backup MX, disable fallback_relay to avoid MX loops

# When relaying mail as backup MX, disable smtp_fallback_relay to avoid MX loops

relay     unix  -       -       <%= @jail %>       -       -       smtp

	-o fallback_relay=

	-o smtp_fallback_relay=

#       -o smtp_helo_timeout=5 -o smtp_connect_timeout=5

showq     unix  n       -       <%= @jail %>       -       -       showq

error     unix  -       -       <%= @jail %>       -       -       error

templates/master.cf.redhat.erb

+2 −2
Changes for templates/master.cf.redhat.erb: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -46,9 +46,9 @@ flush unix n - <%= @jail %> 1000? 0 flush 
proxymap  unix  -       -       n       -       -       proxymap

proxywrite unix -       -       n       -       1       proxymap

smtp      unix  -       -       <%= @jail %>       -       -       smtp

# When relaying mail as backup MX, disable fallback_relay to avoid MX loops

# When relaying mail as backup MX, disable smtp_fallback_relay to avoid MX loops

relay     unix  -       -       <%= @jail %>       -       -       smtp

	-o fallback_relay=

	-o smtp_fallback_relay=

#       -o smtp_helo_timeout=5 -o smtp_connect_timeout=5

showq     unix  n       -       <%= @jail %>       -       -       showq

error     unix  -       -       <%= @jail %>       -       -       error