COOK-4357, fix convergence for sasl_auth

Signed-off-by: Sean OMeara <someara@opscode.com>
This commit is contained in:
Joshua Timberman 2014-02-19 18:59:15 -05:00 committed by Sean OMeara
parent 2122b0656e
commit 75da4877bd
2 changed files with 6 additions and 7 deletions

View File

@ -43,5 +43,9 @@ suites:
- recipe[postfix::sasl_auth] - recipe[postfix::sasl_auth]
attributes: attributes:
postfix: postfix:
main : main:
relayhost: "localhost"
smtp_sasl_auth_enable: "yes" smtp_sasl_auth_enable: "yes"
sasl:
smtp_sasl_user_name: "kitchenuser"
smtp_sasl_passwd: "not-a-real-thing"

View File

@ -44,16 +44,11 @@ end
execute 'postmap-sasl_passwd' do execute 'postmap-sasl_passwd' do
command "postmap #{node['postfix']['sasl_password_file']}" command "postmap #{node['postfix']['sasl_password_file']}"
environment 'PATH' => "#{ENV['PATH']}:/opt/omni/bin:/opt/omni/sbin" if platform_family?('omnios')
action :nothing action :nothing
end end
template node['postfix']['sasl_password_file'] do template node['postfix']['sasl_password_file'] do
command "postmap #{node['postfix']['conf_dir']}/sasl_passwd"
environment :PATH => "#{ENV['PATH']}:/opt/omni/bin:/opt/omni/sbin" if platform_family?('omnios')
action :nothing
end
template "#{node['postfix']['conf_dir']}/sasl_passwd" do
source 'sasl_passwd.erb' source 'sasl_passwd.erb'
owner 'root' owner 'root'
group 'root' group 'root'