properly finish the lsb transition and remove very old templates
This commit is contained in:
mh
parent
f9068edca5
commit
68a23f060f
3 changed files with 48 additions and 168 deletions
|
|
@ -3,6 +3,8 @@
|
||||||
# Postfix master process configuration file. For details on the format
|
# Postfix master process configuration file. For details on the format
|
||||||
# of the file, see the master(5) manual page (command: "man 5 master").
|
# 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
|
# service type private unpriv chroot wakeup maxproc command + args
|
||||||
# (yes) (yes) (yes) (never) (100)
|
# (yes) (yes) (yes) (never) (100)
|
||||||
|
|
@ -10,14 +12,16 @@
|
||||||
<% if smtp_listen == 'all' %>smtp inet n - - - - smtpd
|
<% if smtp_listen == 'all' %>smtp inet n - - - - smtpd
|
||||||
<% else %><%= smtp_listen %>:smtp inet n - - - - smtpd<% end %>
|
<% else %><%= smtp_listen %>:smtp inet n - - - - smtpd<% end %>
|
||||||
<% if use_submission == 'yes' %>submission inet n - - - - smtpd
|
<% 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_sasl_auth_enable=yes
|
||||||
-o smtpd_client_restrictions=permit_sasl_authenticated,reject
|
-o smtpd_client_restrictions=permit_sasl_authenticated,reject
|
||||||
|
-o milter_macro_daemon_name=ORIGINATING
|
||||||
<% end %>
|
<% end %>
|
||||||
<% if use_smtps == 'yes' %>smtps inet n - - - - smtpd
|
<% if use_smtps == 'yes' %>smtps inet n - - - - smtpd
|
||||||
-o smtpd_tls_wrappermode=yes
|
-o smtpd_tls_wrappermode=yes
|
||||||
-o smtpd_sasl_auth_enable=yes
|
-o smtpd_sasl_auth_enable=yes
|
||||||
-o smtpd_client_restrictions=permit_sasl_authenticated,reject
|
-o smtpd_client_restrictions=permit_sasl_authenticated,reject
|
||||||
|
-o milter_macro_daemon_name=ORIGINATING
|
||||||
<% end %>
|
<% end %>
|
||||||
#628 inet n - - - - qmqpd
|
#628 inet n - - - - qmqpd
|
||||||
pickup fifo n - - 60 1 pickup
|
pickup fifo n - - 60 1 pickup
|
||||||
|
|
@ -32,13 +36,15 @@ trace unix - - - - 0 bounce
|
||||||
verify unix - - - - 1 verify
|
verify unix - - - - 1 verify
|
||||||
flush unix n - - 1000? 0 flush
|
flush unix n - - 1000? 0 flush
|
||||||
proxymap unix - - n - - proxymap
|
proxymap unix - - n - - proxymap
|
||||||
|
proxywrite unix - - n - 1 proxymap
|
||||||
smtp unix - - - - - smtp
|
smtp unix - - - - - smtp
|
||||||
# When relaying mail as backup MX, disable fallback_relay to avoid MX loops
|
# When relaying mail as backup MX, disable fallback_relay to avoid MX loops
|
||||||
relay unix - - - - - smtp
|
relay unix - - - - - smtp
|
||||||
-o fallback_relay=
|
-o smtp_fallback_relay=
|
||||||
# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
|
# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
|
||||||
showq unix n - - - - showq
|
showq unix n - - - - showq
|
||||||
error unix - - - - - error
|
error unix - - - - - error
|
||||||
|
retry unix - - - - - error
|
||||||
discard unix - - - - - discard
|
discard unix - - - - - discard
|
||||||
local unix - n n - - local
|
local unix - n n - - local
|
||||||
virtual unix - n n - - virtual
|
virtual unix - n n - - virtual
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
# file managed by puppet
|
|
||||||
#
|
#
|
||||||
# Postfix master process configuration file. For details on the format
|
# Postfix master process configuration file. For details on the format
|
||||||
# of the file, see the master(5) manual page (command: "man 5 master").
|
# of the file, see the master(5) manual page (command: "man 5 master").
|
||||||
|
|
@ -12,11 +11,17 @@
|
||||||
<% if smtp_listen == 'all' %>smtp inet n - - - - smtpd
|
<% if smtp_listen == 'all' %>smtp inet n - - - - smtpd
|
||||||
<% else %><%= smtp_listen %>:smtp inet n - - - - smtpd<% end %>
|
<% else %><%= smtp_listen %>:smtp inet n - - - - smtpd<% end %>
|
||||||
<% if use_submission == 'yes' %>submission inet n - - - - smtpd
|
<% if use_submission == 'yes' %>submission inet n - - - - smtpd
|
||||||
-o smtpd_tls_security_level=encrypt
|
-o smtpd_enforce_tls=yes
|
||||||
-o smtpd_sasl_auth_enable=yes
|
-o smtpd_sasl_auth_enable=yes
|
||||||
-o smtpd_client_restrictions=permit_sasl_authenticated,reject
|
-o smtpd_client_restrictions=permit_sasl_authenticated,reject
|
||||||
-o milter_macro_daemon_name=ORIGINATING
|
|
||||||
<% end %>
|
<% end %>
|
||||||
|
#smtp inet n - - - 1 postscreen
|
||||||
|
#smtpd pass - - - - - smtpd
|
||||||
|
#dnsblog unix - - - - 0 dnsblog
|
||||||
|
# -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
|
||||||
<% if use_smtps == 'yes' %>smtps inet n - - - - smtpd
|
<% if use_smtps == 'yes' %>smtps inet n - - - - smtpd
|
||||||
-o smtpd_tls_wrappermode=yes
|
-o smtpd_tls_wrappermode=yes
|
||||||
-o smtpd_sasl_auth_enable=yes
|
-o smtpd_sasl_auth_enable=yes
|
||||||
|
|
@ -67,6 +72,27 @@ scache unix - - - - 1 scache
|
||||||
maildrop unix - n n - - pipe
|
maildrop unix - n n - - pipe
|
||||||
flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient}
|
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}
|
||||||
|
#
|
||||||
|
# ====================================================================
|
||||||
|
#
|
||||||
# See the Postfix UUCP_README file for configuration details.
|
# See the Postfix UUCP_README file for configuration details.
|
||||||
#
|
#
|
||||||
uucp unix - n n - - pipe
|
uucp unix - n n - - pipe
|
||||||
|
|
@ -120,6 +146,12 @@ sympabounce unix - n n - - pipe
|
||||||
mlmmj unix - n n - - pipe
|
mlmmj unix - n n - - pipe
|
||||||
flags=DORhu user=mlmmj argv=/usr/bin/mlmmj-recieve -F -L /var/spool/mlmmj/$nexthop/
|
flags=DORhu user=mlmmj argv=/usr/bin/mlmmj-recieve -F -L /var/spool/mlmmj/$nexthop/
|
||||||
<%- end -%>
|
<%- end -%>
|
||||||
|
<% if use_firma == 'yes' %>
|
||||||
|
firma unix - n n - - pipe
|
||||||
|
flags=DRhu user=firma argv=/var/lib/firma/firma -p ${user}
|
||||||
|
firmarequest unix - n n - - pipe
|
||||||
|
flags=DRhu user=firma argv=/var/lib/firma/firma -e ${user}
|
||||||
|
<% end %>
|
||||||
|
|
||||||
<%- unless mastercf_tail.to_s.empty? then -%>
|
<%- unless mastercf_tail.to_s.empty? then -%>
|
||||||
<%= mastercf_tail %>
|
<%= mastercf_tail %>
|
||||||
|
|
|
||||||
|
|
@ -1,158 +0,0 @@
|
||||||
#
|
|
||||||
# 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 %>
|
|
||||||
<% 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 %>
|
|
||||||
#smtp inet n - - - 1 postscreen
|
|
||||||
#smtpd pass - - - - - smtpd
|
|
||||||
#dnsblog unix - - - - 0 dnsblog
|
|
||||||
# -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
|
|
||||||
<% 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
|
|
||||||
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
|
|
||||||
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 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
|
|
||||||
#
|
|
||||||
# ====================================================================
|
|
||||||
# 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}
|
|
||||||
#
|
|
||||||
# ====================================================================
|
|
||||||
#
|
|
||||||
# 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}
|
|
||||||
#
|
|
||||||
# ====================================================================
|
|
||||||
#
|
|
||||||
# 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 -%>
|
|
||||||
<% if use_firma == 'yes' %>
|
|
||||||
firma unix - n n - - pipe
|
|
||||||
flags=DRhu user=firma argv=/var/lib/firma/firma -p ${user}
|
|
||||||
firmarequest unix - n n - - pipe
|
|
||||||
flags=DRhu user=firma argv=/var/lib/firma/firma -e ${user}
|
|
||||||
<% end %>
|
|
||||||
|
|
||||||
<%- unless mastercf_tail.to_s.empty? then -%>
|
|
||||||
<%= mastercf_tail %>
|
|
||||||
<%- end -%>
|
|
||||||
Loading…
Reference in a new issue