From 8b78b15e57c4b802be46c540a16be42fd23435f5 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Fri, 25 Jan 2013 14:03:24 -0200 Subject: Switching to parametrized classes --- templates/master.cf.debian-wheezy.erb | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'templates/master.cf.debian-wheezy.erb') diff --git a/templates/master.cf.debian-wheezy.erb b/templates/master.cf.debian-wheezy.erb index 14497f2..cc4bbf0 100644 --- a/templates/master.cf.debian-wheezy.erb +++ b/templates/master.cf.debian-wheezy.erb @@ -8,19 +8,19 @@ # service type private unpriv chroot wakeup maxproc command + args # (yes) (yes) (yes) (never) (100) # ========================================================================== -<% if postfix_smtp_listen == 'all' %>smtp inet n - - - - smtpd -<% else %><%= postfix_smtp_listen %>:smtp inet n - - - - smtpd<% end %> +<% 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 postfix_use_submission == 'yes' %>submission inet n - - - - smtpd +<% if use_submission == 'yes' %>submission inet n - - - - smtpd -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 postfix_use_smtps == 'yes' %>smtps inet n - - - - smtpd +<% 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 @@ -114,7 +114,7 @@ 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' %> +<% if use_amavisd == 'yes' %> amavis unix - - - - 2 smtp -o smtp_data_done_timeout=1200 -o smtp_send_xforward_command=yes @@ -133,25 +133,25 @@ 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' %> +<% 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 postfix_use_schleuder == 'yes' %> +<% if use_schleuder == 'yes' %> schleuder unix - n n - - pipe flags=DRhu user=schleuder argv=/usr/bin/schleuder ${user} <% end %> -<% if postfix_use_sympa == 'yes' %> +<% 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 postfix_use_mlmmj == 'yes' %> +<% 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 postfix_mastercf_tail.to_s.empty? then -%> -<%= postfix_mastercf_tail %> +<%- unless mastercf_tail.to_s.empty? then -%> +<%= mastercf_tail %> <%- end -%> -- cgit v1.2.3