From 522595a03e9ea9517ba2ec0c798857d9b6e18a8d Mon Sep 17 00:00:00 2001 From: jtimberman Date: Wed, 2 Dec 2009 14:01:58 -0700 Subject: [PATCH] cook-218 set the 'sasl only' attributes to defaults --- attributes/postfix.rb | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/attributes/postfix.rb b/attributes/postfix.rb index afdeb7c..9246a44 100644 --- a/attributes/postfix.rb +++ b/attributes/postfix.rb @@ -6,12 +6,9 @@ set_unless[:postfix][:relayhost] = "" set_unless[:postfix][:mail_relay_networks] = "127.0.0.0/8" set_unless[:postfix][:smtp_sasl_auth_enable] = "no" - -if postfix[:smtp_sasl_auth_enable] == "yes" - set_unless[:postfix][:smtp_sasl_password_maps] = "hash:/etc/postfix/sasl_passwd" - set_unless[:postfix][:smtp_sasl_security_options] = "noanonymous" - set_unless[:postfix][:smtp_tls_cafile] = "/etc/postfix/cacert.pem" - set_unless[:postfix][:smtp_use_tls] = "yes" - set_unless[:postfix][:smtp_sasl_user_name] = "" - set_unless[:postfix][:smtp_sasl_passwd] = "" -end +set_unless[:postfix][:smtp_sasl_password_maps] = "hash:/etc/postfix/sasl_passwd" +set_unless[:postfix][:smtp_sasl_security_options] = "noanonymous" +set_unless[:postfix][:smtp_tls_cafile] = "/etc/postfix/cacert.pem" +set_unless[:postfix][:smtp_use_tls] = "yes" +set_unless[:postfix][:smtp_sasl_user_name] = "" +set_unless[:postfix][:smtp_sasl_passwd] = ""