[deprec] Use @ in front of erb tags in debian master.cf
Puppet 3 now throws a deprecation warning about this.
This commit is contained in:
varac
parent
58c687dcaa
commit
6751268f0f
3 changed files with 37 additions and 37 deletions
|
|
@ -8,25 +8,25 @@
|
|||
# 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 @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 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 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
|
||||
-o milter_macro_daemon_name=ORIGINATING
|
||||
<% end %>
|
||||
#628 inet n - - - - qmqpd
|
||||
#628 inet n - - - - qmqpd
|
||||
pickup fifo n - - 60 1 pickup
|
||||
cleanup unix n - - - 0 cleanup
|
||||
qmgr fifo n - n 300 1 qmgr
|
||||
|
|
@ -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 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 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}
|
||||
flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -n -m ${extension}
|
||||
<% end %>
|
||||
<% if use_schleuder == 'yes' %>
|
||||
<% if @use_schleuder == 'yes' %>
|
||||
schleuder unix - n n - - pipe
|
||||
flags=DRhu user=schleuder argv=/usr/bin/schleuder ${user}
|
||||
<% end %>
|
||||
<% if 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 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 mastercf_tail.to_s.empty? then -%>
|
||||
<%= mastercf_tail %>
|
||||
<%- unless @mastercf_tail.to_s.empty? then -%>
|
||||
<%= @mastercf_tail %>
|
||||
<%- end -%>
|
||||
|
|
|
|||
|
|
@ -8,19 +8,19 @@
|
|||
# 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 @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 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 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 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 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 use_schleuder == 'yes' %>
|
||||
<% if @use_schleuder == 'yes' %>
|
||||
schleuder unix - n n - - pipe
|
||||
flags=DRhu user=schleuder argv=/usr/bin/schleuder ${user}
|
||||
<% end %>
|
||||
<% if 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 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 mastercf_tail.to_s.empty? then -%>
|
||||
<%= mastercf_tail %>
|
||||
<%- unless @mastercf_tail.to_s.empty? then -%>
|
||||
<%= @mastercf_tail %>
|
||||
<%- end -%>
|
||||
|
|
|
|||
|
|
@ -8,25 +8,25 @@
|
|||
# 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 @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 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 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
|
||||
-o milter_macro_daemon_name=ORIGINATING
|
||||
<% end %>
|
||||
#628 inet n - - - - qmqpd
|
||||
#628 inet n - - - - qmqpd
|
||||
pickup fifo n - - 60 1 pickup
|
||||
cleanup unix n - - - 0 cleanup
|
||||
qmgr fifo n - n 300 1 qmgr
|
||||
|
|
@ -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 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 use_dovecot_lda == 'yes' %>
|
||||
<% if @use_dovecot_lda == 'yes' %>
|
||||
dovecot unix - n n - - pipe
|
||||
flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -d ${recipient}
|
||||
flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -n -m ${extension}
|
||||
<% end %>
|
||||
<% if use_schleuder == 'yes' %>
|
||||
<% if @use_schleuder == 'yes' %>
|
||||
schleuder unix - n n - - pipe
|
||||
flags=DRhu user=schleuder argv=/usr/bin/schleuder ${user}
|
||||
<% end %>
|
||||
<% if 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 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 mastercf_tail.to_s.empty? then -%>
|
||||
<%= mastercf_tail %>
|
||||
<%- unless @mastercf_tail.to_s.empty? then -%>
|
||||
<%= @mastercf_tail %>
|
||||
<%- end -%>
|
||||
|
|
|
|||
Loading…
Reference in a new issue