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

[COOK-4322]: Fix the default path for the sasl_passwd file

Browse Source 
Signed-off-by: Sean OMeara <someara@opscode.com>
This commit is contained in:
Mick Brooks 2014-02-19 01:06:56 -05:00 committed by Sean OMeara
parent 761fe139e0
commit 14fc7d7919
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
attributes/default.rb
View File

@ -79,7 +79,8 @@ if node['postfix']['main']['smtp_use_tls'] == 'yes'
end end
if node['postfix']['main']['smtp_sasl_auth_enable'] == 'yes' if node['postfix']['main']['smtp_sasl_auth_enable'] == 'yes'
default['postfix']['main']['smtp_sasl_password_maps'] = "hash:#{node['postfix']['conf_dir']}/postfix/sasl_passwd" default['postfix']['sasl_password_file'] = "#{node['postfix']['conf_dir']}/sasl_passwd"
default['postfix']['main']['smtp_sasl_password_maps'] = "hash:#{node['postfix']['sasl_password_file']}"
default['postfix']['main']['smtp_sasl_security_options'] = 'noanonymous' default['postfix']['main']['smtp_sasl_security_options'] = 'noanonymous'
default['postfix']['sasl']['smtp_sasl_user_name'] = '' default['postfix']['sasl']['smtp_sasl_user_name'] = ''
default['postfix']['sasl']['smtp_sasl_passwd'] = '' default['postfix']['sasl']['smtp_sasl_passwd'] = ''

4
files/default/tests/minitest/sasl_auth_test.rb
View File

@ -22,4 +22,8 @@ describe 'postfix::sasl_auth' do
file('/etc/postfix/sasl_passwd').must_match(/^# This file is generated by Chef for/) file('/etc/postfix/sasl_passwd').must_match(/^# This file is generated by Chef for/)
end end
it 'configures postfix to use /etc/postfix/sasl_passwd' do
file('/etc/postfix/main.cf').must_match(/^\s*smtp_sasl_password_maps\s*=.*\/etc\/postfix\/sasl_passwd\s*$/)
end
end end

4
recipes/sasl_auth.rb
View File

@ -43,11 +43,11 @@ sasl_pkgs.each do |pkg|
end end
execute 'postmap-sasl_passwd' do execute 'postmap-sasl_passwd' do
command 'postmap /etc/postfix/sasl_passwd' command "postmap #{node['postfix']['sasl_password_file']}"
action :nothing action :nothing
end end
template '/etc/postfix/sasl_passwd' do template node['postfix']['sasl_password_file'] do
source 'sasl_passwd.erb' source 'sasl_passwd.erb'
owner 'root' owner 'root'
group 'root' group 'root'