From 75da4877bda8524abff492506fc7c43a7619a07d Mon Sep 17 00:00:00 2001 From: Joshua Timberman Date: Wed, 19 Feb 2014 18:59:15 -0500 Subject: [PATCH] COOK-4357, fix convergence for sasl_auth Signed-off-by: Sean OMeara --- .kitchen.yml | 6 +++++- recipes/sasl_auth.rb | 7 +------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index 2990b92..ee314dc 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -43,5 +43,9 @@ suites: - recipe[postfix::sasl_auth] attributes: postfix: - main : + main: + relayhost: "localhost" smtp_sasl_auth_enable: "yes" + sasl: + smtp_sasl_user_name: "kitchenuser" + smtp_sasl_passwd: "not-a-real-thing" diff --git a/recipes/sasl_auth.rb b/recipes/sasl_auth.rb index 379b816..18be42f 100644 --- a/recipes/sasl_auth.rb +++ b/recipes/sasl_auth.rb @@ -44,16 +44,11 @@ end execute 'postmap-sasl_passwd' do command "postmap #{node['postfix']['sasl_password_file']}" + environment 'PATH' => "#{ENV['PATH']}:/opt/omni/bin:/opt/omni/sbin" if platform_family?('omnios') action :nothing end 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' owner 'root' group 'root'