diff options
| -rw-r--r-- | manifests/init.pp | 4 | ||||
| -rw-r--r-- | manifests/transport.pp | 6 | ||||
| -rw-r--r-- | manifests/virtual.pp | 6 | ||||
| -rw-r--r-- | templates/master.cf.debian-5.erb (renamed from templates/master.cf.debian-lenny.erb) | 0 | ||||
| -rw-r--r-- | templates/master.cf.debian-6.erb (renamed from templates/master.cf.debian-squeeze.erb) | 0 | ||||
| -rw-r--r-- | templates/master.cf.debian-7.erb (renamed from templates/master.cf.debian-wheezy.erb) | 0 | ||||
| -rw-r--r-- | templates/master.cf.debian-8.erb (renamed from templates/master.cf.debian-etch.erb) | 47 |
7 files changed, 50 insertions, 13 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index c7b9ce8..3d51bb1 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -59,7 +59,7 @@ class postfix( case $::operatingsystem { RedHat, CentOS: { - case $::lsbmajdistrelease { + case $::operatingsystemmajrelease { "4": { $postfix_seltype = "etc_t" } "5": { $postfix_seltype = "postfix_etc_t" } default: { $postfix_seltype = undef } @@ -143,7 +143,7 @@ class postfix( content => $::operatingsystem ? { Redhat => template("postfix/master.cf.redhat5.erb"), CentOS => template("postfix/master.cf.redhat5.erb"), - Debian => template("postfix/master.cf.debian-${::lsbdistcodename}.erb"), + Debian => template("postfix/master.cf.debian-${::operatingsystemmajrelease}.erb"), Ubuntu => template("postfix/master.cf.debian-etch.erb"), }, seltype => $postfix_seltype, diff --git a/manifests/transport.pp b/manifests/transport.pp index 90c5468..08b93e5 100644 --- a/manifests/transport.pp +++ b/manifests/transport.pp @@ -12,7 +12,7 @@ Requires: - Class["postfix"] - Postfix::Hash["/etc/postfix/transport"] - Postfix::Config["transport_maps"] -- common::line (from module common) +- file_line (from module stdlib) Example usage: @@ -34,9 +34,9 @@ Example usage: */ define postfix::transport ($ensure="present", $destination) { - line {"${name} ${destination}": + file_line {"${name} ${destination}": ensure => $ensure, - file => "/etc/postfix/transport", + path => "/etc/postfix/transport", line => "${name} ${destination}", notify => Exec["generate /etc/postfix/transport.db"], require => Package["postfix"], diff --git a/manifests/virtual.pp b/manifests/virtual.pp index d6912a4..06df32a 100644 --- a/manifests/virtual.pp +++ b/manifests/virtual.pp @@ -12,7 +12,7 @@ Requires: - Class["postfix"] - Postfix::Hash["/etc/postfix/virtual"] - Postfix::Config["virtual_alias_maps"] -- common::line (from module common) +- file_line (from module stdlib) Example usage: @@ -34,9 +34,9 @@ Example usage: */ define postfix::virtual ($ensure="present", $destination) { - line {"${name} ${destination}": + file_line {"${name} ${destination}": ensure => $ensure, - file => "/etc/postfix/virtual", + path => "/etc/postfix/virtual", line => "${name} ${destination}", notify => Exec["generate /etc/postfix/virtual.db"], require => Package["postfix"], diff --git a/templates/master.cf.debian-lenny.erb b/templates/master.cf.debian-5.erb index 50241b8..50241b8 100644 --- a/templates/master.cf.debian-lenny.erb +++ b/templates/master.cf.debian-5.erb diff --git a/templates/master.cf.debian-squeeze.erb b/templates/master.cf.debian-6.erb index 9ce3264..9ce3264 100644 --- a/templates/master.cf.debian-squeeze.erb +++ b/templates/master.cf.debian-6.erb diff --git a/templates/master.cf.debian-wheezy.erb b/templates/master.cf.debian-7.erb index cc4bbf0..cc4bbf0 100644 --- a/templates/master.cf.debian-wheezy.erb +++ b/templates/master.cf.debian-7.erb diff --git a/templates/master.cf.debian-etch.erb b/templates/master.cf.debian-8.erb index b49a399..a4c39b7 100644 --- a/templates/master.cf.debian-etch.erb +++ b/templates/master.cf.debian-8.erb @@ -1,23 +1,30 @@ -# file managed by puppet # # Postfix master process configuration file. For details on the format # of the file, see the master(5) manual page (command: "man 5 master"). # +# Do not forget to execute "postfix reload" after editing this file. +# # ========================================================================== # service type private unpriv chroot wakeup maxproc command + args # (yes) (yes) (yes) (never) (100) # ========================================================================== <% if smtp_listen == 'all' %>smtp inet n - - - - smtpd <% else %><%= smtp_listen %>:smtp inet n - - - - smtpd<% end %> +#smtp inet n - - - 1 postscreen +#smtpd pass - - - - - smtpd +#dnsblog unix - - - - 0 dnsblog +#tlsproxy unix - - - - 0 tlsproxy <% if use_submission == 'yes' %>submission inet n - - - - smtpd - -o smtpd_enforce_tls=yes + -o smtpd_tls_security_level=encrypt -o smtpd_sasl_auth_enable=yes -o smtpd_client_restrictions=permit_sasl_authenticated,reject + -o milter_macro_daemon_name=ORIGINATING <% end %> <% if use_smtps == 'yes' %>smtps inet n - - - - smtpd -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes -o smtpd_client_restrictions=permit_sasl_authenticated,reject + -o milter_macro_daemon_name=ORIGINATING <% end %> #628 inet n - - - - qmqpd pickup fifo n - - 60 1 pickup @@ -32,19 +39,21 @@ trace unix - - - - 0 bounce verify unix - - - - 1 verify flush unix n - - 1000? 0 flush proxymap unix - - n - - proxymap +proxywrite unix - - n - 1 proxymap smtp unix - - - - - smtp # When relaying mail as backup MX, disable fallback_relay to avoid MX loops relay unix - - - - - smtp - -o fallback_relay= + -o smtp_fallback_relay= # -o smtp_helo_timeout=5 -o smtp_connect_timeout=5 showq unix n - - - - showq error unix - - - - - error +retry unix - - - - - error discard unix - - - - - discard local unix - n n - - local virtual unix - n n - - virtual lmtp unix - - - - - lmtp anvil unix - - - - 1 anvil -scache unix - - - - 1 scache +scache unix - - - - 1 scache # # ==================================================================== # Interfaces to non-Postfix software. Be sure to examine the manual @@ -61,6 +70,33 @@ scache unix - - - - 1 scache maildrop unix - n n - - pipe flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient} # +# ==================================================================== +# +# Recent Cyrus versions can use the existing "lmtp" master.cf entry. +# +# Specify in cyrus.conf: +# lmtp cmd="lmtpd -a" listen="localhost:lmtp" proto=tcp4 +# +# Specify in main.cf one or more of the following: +# mailbox_transport = lmtp:inet:localhost +# virtual_transport = lmtp:inet:localhost +# +# ==================================================================== +# +# Cyrus 2.1.5 (Amos Gouaux) +# Also specify in main.cf: cyrus_destination_recipient_limit=1 +# +#cyrus unix - n n - - pipe +# user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user} +# +# ==================================================================== +# Old example of delivery via Cyrus. +# +#old-cyrus unix - n n - - pipe +# flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user} +# +# ==================================================================== +# # See the Postfix UUCP_README file for configuration details. # uucp unix - n n - - pipe @@ -77,6 +113,7 @@ scalemail-backend unix - n n - 2 pipe mailman unix - n n - - pipe flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py ${nexthop} ${user} + <% if use_amavisd == 'yes' %> amavis unix - - - - 2 smtp -o smtp_data_done_timeout=1200 @@ -98,7 +135,7 @@ amavis unix - - - - 2 smtp <% end %> <% if use_dovecot_lda == 'yes' %> dovecot unix - n n - - pipe - flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -n -m ${extension} + flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -n -m ${extension} <% end %> <% if use_schleuder == 'yes' %> schleuder unix - n n - - pipe |