From 18661db4da9bb3f599ee473993c267de918fa0ce Mon Sep 17 00:00:00 2001 From: Francois Deppierraz Date: Tue, 22 Dec 2009 20:28:15 +0100 Subject: Breaks backward compat: A few $postfix_ng_ variables were changed into $postfix_ variables --- templates/master.cf.debian-etch.erb | 2 +- templates/master.cf.redhat5.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/master.cf.debian-etch.erb b/templates/master.cf.debian-etch.erb index 674682c..9a8351a 100644 --- a/templates/master.cf.debian-etch.erb +++ b/templates/master.cf.debian-etch.erb @@ -7,7 +7,7 @@ # service type private unpriv chroot wakeup maxproc command + args # (yes) (yes) (yes) (never) (100) # ========================================================================== -<%= postfix_ng_smtp_listen %>:smtp inet n - - - - smtpd +<%= postfix_smtp_listen %>:smtp inet n - - - - smtpd #submission inet n - - - - smtpd # -o smtpd_enforce_tls=yes # -o smtpd_sasl_auth_enable=yes diff --git a/templates/master.cf.redhat5.erb b/templates/master.cf.redhat5.erb index 08564b2..8c3ee53 100644 --- a/templates/master.cf.redhat5.erb +++ b/templates/master.cf.redhat5.erb @@ -7,7 +7,7 @@ # service type private unpriv chroot wakeup maxproc command + args # (yes) (yes) (yes) (never) (100) # ========================================================================== -<%= postfix_ng_smtp_listen %>:smtp inet n - n - - smtpd +<%= postfix_smtp_listen %>:smtp inet n - n - - smtpd #smtp inet n - n - - smtpd #submission inet n - n - - smtpd # -o smtpd_enforce_tls=yes -- cgit v1.2.3 From 972762ce0c8b18950bdb37300b45477e7eb782d5 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sat, 10 Jul 2010 13:34:10 -0300 Subject: Allowing 'all' for postfix_smtp_listen --- templates/master.cf.debian-etch.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/master.cf.debian-etch.erb b/templates/master.cf.debian-etch.erb index 9a8351a..d711551 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_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 -- cgit v1.2.3 From 3ecf57eb82ed7fcc41b30695dbe3ba45b9a0a7c6 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Fri, 6 Aug 2010 18:31:11 -0300 Subject: Optional amavisd configuration --- templates/master.cf.debian-etch.erb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'templates') diff --git a/templates/master.cf.debian-etch.erb b/templates/master.cf.debian-etch.erb index d711551..df1241c 100644 --- a/templates/master.cf.debian-etch.erb +++ b/templates/master.cf.debian-etch.erb @@ -75,4 +75,22 @@ 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 +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 %> -- cgit v1.2.3 From eef9c501a2c65f60a77520575b2740bfbc9a2ec4 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sun, 8 Aug 2010 17:45:08 -0300 Subject: Introducing postfix_use_dovecot_lda --- templates/master.cf.debian-etch.erb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'templates') diff --git a/templates/master.cf.debian-etch.erb b/templates/master.cf.debian-etch.erb index df1241c..af387ef 100644 --- a/templates/master.cf.debian-etch.erb +++ b/templates/master.cf.debian-etch.erb @@ -94,3 +94,7 @@ amavis unix - - - - 2 smtp -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 %> -- cgit v1.2.3 From 777d2cef1c466924f6fc40640932ef74b76276f0 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Mon, 23 Aug 2010 21:53:07 -0300 Subject: Schleuder configuration --- templates/master.cf.debian-etch.erb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'templates') diff --git a/templates/master.cf.debian-etch.erb b/templates/master.cf.debian-etch.erb index af387ef..d8e02d8 100644 --- a/templates/master.cf.debian-etch.erb +++ b/templates/master.cf.debian-etch.erb @@ -98,3 +98,7 @@ amavis unix - - - - 2 smtp 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 %> -- cgit v1.2.3 From 9cfb03fef5af5d2a75334e527b088f9713a87b3f Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Tue, 24 Aug 2010 13:41:42 -0300 Subject: Adding sympa transports --- templates/master.cf.debian-etch.erb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'templates') diff --git a/templates/master.cf.debian-etch.erb b/templates/master.cf.debian-etch.erb index d8e02d8..e6bc4ec 100644 --- a/templates/master.cf.debian-etch.erb +++ b/templates/master.cf.debian-etch.erb @@ -102,3 +102,9 @@ dovecot unix - n n - - pipe 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 %> -- cgit v1.2.3