kosmos/postfix-cookbook
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #97 from cmluciano/drag00n/adddebiancert

Browse Source 
Update CAfile path for Debian-based OS.
This commit is contained in:
Lamont Granquist 2015-02-18 12:08:35 -08:00
commit 0008961b28
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
attributes/default.rb
View File

@ -87,6 +87,8 @@ default['postfix']['main']['inet_interfaces'] = 'loopback-only'
# Conditional attributes, also reference _attributes recipe # Conditional attributes, also reference _attributes recipe
case node['platform_family'] case node['platform_family']
when 'debian'
default['postfix']['cafile'] = '/etc/ssl/certs/ca-certificates.crt'
when 'smartos' when 'smartos'
default['postfix']['main']['smtpd_use_tls'] = 'no' default['postfix']['main']['smtpd_use_tls'] = 'no'
default['postfix']['main']['smtp_use_tls'] = 'no' default['postfix']['main']['smtp_use_tls'] = 'no'

2
spec/default_spec.rb
View File

@ -39,7 +39,7 @@ describe 'postfix::default' do
end end
it '[COOK-4423] renders file main.cf with /etc/postfix/cacert.pem' do it '[COOK-4423] renders file main.cf with /etc/postfix/cacert.pem' do
expect(chef_run).to render_file('/etc/postfix/main.cf').with_content(%r{smtp_tls_CAfile += +/etc/postfix/cacert.pem}) expect(chef_run).to render_file('/etc/postfix/main.cf').with_content(%r{smtp_tls_CAfile += +/etc/ssl/certs/ca-certificates.crt})
end end
it '[COOK-4619] does not set recipient_delimiter' do it '[COOK-4619] does not set recipient_delimiter' do