Skip to content
GitLab
Menu
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
204d1ec9
Commit
204d1ec9
authored
Mar 29, 2015
by
Mickaël Canévet
Browse files
Merge pull request #73 from phathocker/issue-postfixldap
PR postfix-ldap issue on RedHat based OSes
parents
37052f43
97d27ef3
Changes
2
Hide whitespace changes
Inline
Side-by-side
manifests/ldap.pp
View file @
204d1ec9
...
...
@@ -14,8 +14,11 @@
# include postfix::ldap
#
class
postfix::ldap
{
package
{
'postfix-ldap'
:
}
if
$::osfamily
==
'Debian'
{
package
{
'postfix-ldap'
:
before
=>
File
[
'/etc/postfix/ldap-aliases.cf'
],
}
}
if
!
$postfix::ldap_base
{
fail
'Missing $postfix::ldap_base !'
...
...
@@ -36,6 +39,5 @@ class postfix::ldap {
owner
=>
'root'
,
group
=>
'postfix'
,
content
=>
template
(
'postfix/postfix-ldap-aliases.cf.erb'
),
require
=>
Package
[
'postfix-ldap'
],
}
}
spec/classes/postfix_spec.rb
View file @
204d1ec9
...
...
@@ -170,7 +170,7 @@ describe 'postfix' do
:master_smtp
=>
"smtp inet n - - - - smtpd
-o smtpd_client_restrictions=check_client_access,hash:/etc/postfix/access,reject"
,
}
}
it
'should update master.cf with the specified flags to smtp'
do
it
'should update master.cf with the specified flags to smtp'
do
is_expected
.
to
contain_file
(
'/etc/postfix/master.cf'
).
with_seltype
(
'postfix_etc_t'
).
with_content
(
/smtp inet n - - - - smtpd/
).
with_content
(
/^smtp.*\n.*smtpd_client_restrictions=check_client_access,hash:/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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