diff options
| -rw-r--r-- | manifests/init.pp | 4 | ||||
| -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-etch.erb | 120 |
5 files changed, 2 insertions, 122 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/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-etch.erb deleted file mode 100644 index b49a399..0000000 --- a/templates/master.cf.debian-etch.erb +++ /dev/null @@ -1,120 +0,0 @@ -# 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"). -# -# ========================================================================== -# 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 %> -<% if use_submission == 'yes' %>submission inet n - - - - smtpd - -o smtpd_enforce_tls=yes - -o smtpd_sasl_auth_enable=yes - -o smtpd_client_restrictions=permit_sasl_authenticated,reject -<% 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 -<% end %> -#628 inet n - - - - qmqpd -pickup fifo n - - 60 1 pickup -cleanup unix n - - - 0 cleanup -qmgr fifo n - n 300 1 qmgr -#qmgr fifo n - - 300 1 oqmgr -tlsmgr unix - - - 1000? 1 tlsmgr -rewrite unix - - - - - trivial-rewrite -bounce unix - - - - 0 bounce -defer unix - - - - 0 bounce -trace unix - - - - 0 bounce -verify unix - - - - 1 verify -flush unix n - - 1000? 0 flush -proxymap unix - - n - - 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_helo_timeout=5 -o smtp_connect_timeout=5 -showq unix n - - - - showq -error 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 -# -# ==================================================================== -# Interfaces to non-Postfix software. Be sure to examine the manual -# pages of the non-Postfix software to find out what options it wants. -# -# Many of the following services use the Postfix pipe(8) delivery -# agent. See the pipe(8) man page for information about ${recipient} -# and other message envelope options. -# ==================================================================== -# -# maildrop. See the Postfix MAILDROP_README file for details. -# Also specify in main.cf: maildrop_destination_recipient_limit=1 -# -maildrop unix - n n - - pipe - flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient} -# -# See the Postfix UUCP_README file for configuration details. -# -uucp unix - n n - - pipe - flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient) -# -# Other external delivery methods. -# -ifmail unix - n n - - pipe - flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient) -bsmtp unix - n n - - pipe - flags=Fq. user=bsmtp argv=/usr/lib/bsmtp/bsmtp -t$nexthop -f$sender $recipient -scalemail-backend unix - n n - 2 pipe - flags=R user=scalemail argv=/usr/lib/scalemail/bin/scalemail-store ${nexthop} ${user} ${extension} -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 - -o smtp_send_xforward_command=yes - -127.0.0.1:10025 inet n - - - - smtpd - -o content_filter= - -o local_recipient_maps= - -o relay_recipient_maps= - -o smtpd_restriction_classes= - -o smtpd_client_restrictions= - -o smtpd_helo_restrictions= - -o smtpd_sender_restrictions= - -o smtpd_recipient_restrictions=permit_mynetworks,reject - -o mynetworks=127.0.0.0/8 - -o strict_rfc821_envelopes=yes - -o receive_override_options=no_unknown_recipient_checks,no_header_body_checks - -o smtpd_bind_address=127.0.0.1 -<% 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} -<% end %> -<% if use_schleuder == 'yes' %> -schleuder unix - n n - - pipe - flags=DRhu user=schleuder argv=/usr/bin/schleuder ${user} -<% end %> -<% if use_sympa == 'yes' %> -sympa unix - n n - - pipe - flags=R user=sympa argv=/usr/lib/sympa/bin/queue ${recipient} -sympabounce unix - n n - - pipe - flags=R user=sympa argv=/usr/lib/sympa/bin/bouncequeue ${user} -<% end %> -<% if use_mlmmj == 'yes' %> -mlmmj unix - n n - - pipe - flags=DORhu user=mlmmj argv=/usr/bin/mlmmj-recieve -F -L /var/spool/mlmmj/$nexthop/ -<%- end -%> - -<%- unless mastercf_tail.to_s.empty? then -%> -<%= mastercf_tail %> -<%- end -%> |