Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Projets publics
Puppet Camptocamp Postfix
Commits
de6c111a
Commit
de6c111a
authored
May 20, 2013
by
Raphaël Pinson
Browse files
Fix unscoped variables in templates/master.cf.common.erb
parent
6b995331
Changes
2
Hide whitespace changes
Inline
Side-by-side
spec/classes/postfix_spec.rb
View file @
de6c111a
...
...
@@ -98,7 +98,16 @@ describe 'postfix' do
it
{
should
contain_file
(
'/etc/postfix/master.cf'
).
without
(
'seltype'
).
with_content
(
/smtp inet n - - - - smtpd/
)
}
).
with_content
(
/amavis unix/
).
with_content
(
/dovecot.*\n.* user=bar:bar /
).
with_content
(
/schleuder/
).
with_content
(
/sympa/
)
}
it
{
should
contain_file
(
'/etc/postfix/main.cf'
).
without
(
'seltype'
)
}
it
{
should
contain_postfix__config
(
'myorigin'
)
}
...
...
templates/master.cf.common.erb
View file @
de6c111a
<%
if
has_variable?
(
"
postfix
_
use_amavisd
"
)
and
postfix_use_amavisd
==
'yes'
%>
<%
if
scope
.
lookupvar
(
'
postfix
::
use_amavisd
'
)
==
'yes'
%>
amavis unix - - - - 2 smtp
-o smtp_data_done_timeout=1200
-o smtp_send_xforward_command=yes
...
...
@@ -17,15 +17,15 @@ 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
has_variable?
(
"
postfix
_
use_dovecot_lda
"
)
and
postfix_use_dovecot_lda
==
'yes'
%>
<%
if
scope
.
lookupvar
(
'
postfix
::
use_dovecot_lda
'
)
==
'yes'
%>
dovecot unix - n n - - pipe
flags=DRhu user=
<%=
postfix
_
mail_user
%>
:
<%=
postfix
_
mail_user
%>
argv=/usr/lib/dovecot/deliver -d ${recipient}
flags=DRhu user=
<%=
scope
.
lookupvar
(
'
postfix
::
mail_user
'
)
%>
:
<%=
scope
.
lookupvar
(
'
postfix
::
mail_user
'
)
%>
argv=/usr/lib/dovecot/deliver -d ${recipient}
<%
end
-%>
<%
if
has_variable?
(
"
postfix
_
use_schleuder
"
)
and
postfix_use_schleuder
==
'yes'
%>
<%
if
scope
.
lookupvar
(
'
postfix
::
use_schleuder
'
)
==
'yes'
%>
schleuder unix - n n - - pipe
flags=DRhu user=schleuder argv=/usr/bin/schleuder ${user}
<%
end
-%>
<%
if
has_variable?
(
"
postfix
_
use_sympa
"
)
and
postfix_use_sympa
==
'yes'
%>
<%
if
scope
.
lookupvar
(
'
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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment