Commit 204d1ec9 authored by Mickaël Canévet's avatar 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
......@@ -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'],
}
}
......@@ -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:/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment