tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

smtpd: Manual merge from parameterize branch

Browse source
This commit is contained in:
Ossi Salmi 2015-05-04 10:11:05 +03:00
parent 8de3a4c16d
commit a8ebd9417c
3 changed files with 284 additions and 265 deletions
Download patch file Download diff file Expand all files Collapse all files

8
smtpd/templates/client.conf.erb
View file

@ -1,14 +1,14 @@
<% if @operatingsystem == "OpenBSD" -%>
listen on lo0
<% else -%>
listen on localhost
listen on lo
<% end -%>
table aliases db:<%= @aliases %>.db
<% if @relay -%>
accept from local for any relay via <%= @relay %><% if @mail_domain %> as "@<%= @mail_domain %>"<% end %>
<% if @mailrelay -%>
accept from local for any relay via <%= @mailrelay %><% if @maildomain %> as "@<%= @maildomain %>"<% end %>
<% else -%>
accept from local for local alias <aliases> deliver to mbox
accept from local for any relay<% if @mail_domain %> as "@<%= @mail_domain %>"<% end %>
accept from local for any relay<% if @maildomain %> as "@<%= @maildomain %>"<% end %>
<% end -%>