aboutsummaryrefslogtreecommitdiff
path: root/templates/master.cf.debian-etch.erb
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2010-11-02 18:26:55 +0100
committervarac <varacanero@zeromail.org>2010-11-02 18:26:55 +0100
commit070c247e96ac14630975f8ac065ee7976fd7f0b6 (patch)
treec36a7ba63884734a796b73aa0e5c63db472d0d31 /templates/master.cf.debian-etch.erb
parent60544a57c9e2d014061d2c2775654918890a648c (diff)
parent6193e0e0e9f2263d9a297cc0f19dffe1b25483de (diff)
downloadpuppet-postfix-070c247e96ac14630975f8ac065ee7976fd7f0b6.tar.gz
puppet-postfix-070c247e96ac14630975f8ac065ee7976fd7f0b6.tar.bz2
merge with git://labs.riseup.net/shared-postfix
Diffstat (limited to 'templates/master.cf.debian-etch.erb')
-rw-r--r--templates/master.cf.debian-etch.erb64
1 files changed, 34 insertions, 30 deletions
diff --git a/templates/master.cf.debian-etch.erb b/templates/master.cf.debian-etch.erb
index aa5f34f..e6bc4ec 100644
--- a/templates/master.cf.debian-etch.erb
+++ b/templates/master.cf.debian-etch.erb
@@ -7,7 +7,8 @@
# service type private unpriv chroot wakeup maxproc command + args
# (yes) (yes) (yes) (never) (100)
# ==========================================================================
-<%= postfix_ng_smtp_listen %>:smtp inet n - - - - smtpd
+<% if postfix_smtp_listen == 'all' %>smtp inet n - - - - smtpd
+<% else %><%= postfix_smtp_listen %>:smtp inet n - - - - smtpd<% end %>
#submission inet n - - - - smtpd
# -o smtpd_enforce_tls=yes
# -o smtpd_sasl_auth_enable=yes
@@ -74,33 +75,36 @@ 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 postfix_use_amavisd == 'yes' %>
+amavis unix - - - - 2 smtp
+ -o smtp_data_done_timeout=1200
+ -o smtp_send_xforward_command=yes
-
-# Amavis
-<% if (postfix_amavis == "true" ) -%>
-
-## http://www.freespamfilter.org/FC4.html#_Toc110999176
-
-smtp-amavis unix - - y - 2 smtp
- -o smtp_data_done_timeout=1200
- -o smtp_send_xforward_command=yes
- -o disable_dns_lookups=yes
-
-127.0.0.1:10025 inet n - y - - smtpd
- -o content_filter=
- -o local_recipient_maps=
- -o relay_recipient_maps=
- -o smtpd_restriction_classes=
- -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 smtpd_error_sleep_time=0
- -o smtpd_soft_error_limit=1001
- -o smtpd_hard_error_limit=1000
- -o receive_override_options=no_header_body_checks
-<% else -%>
-# Amavis not configured
-<% end -%>
-
+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 postfix_use_dovecot_lda == 'yes' %>
+dovecot unix - n n - - pipe
+ flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -d ${recipient}
+<% end %>
+<% if postfix_use_schleuder == 'yes' %>
+schleuder unix - n n - - pipe
+ flags=DRhu user=schleuder argv=/usr/bin/schleuder ${user}
+<% end %>
+<% if postfix_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 %>