diff --git a/recipes/_attributes.rb b/recipes/_attributes.rb index ef4c9f5..06c828e 100644 --- a/recipes/_attributes.rb +++ b/recipes/_attributes.rb @@ -31,8 +31,6 @@ node.default_unless['postfix']['sasl_password_file'] = "#{node['postfix']['conf_dir']}/sasl_passwd" node.default_unless['postfix']['main']['smtp_sasl_password_maps'] = "#{node['postfix']['db_type']}:#{node['postfix']['sasl_password_file']}" node.default_unless['postfix']['main']['smtp_sasl_security_options'] = 'noanonymous' - node.default_unless['postfix']['sasl']['smtp_sasl_user_name'] = '' - node.default_unless['postfix']['sasl']['smtp_sasl_passwd'] = '' node.default_unless['postfix']['main']['relayhost'] = '' end diff --git a/test/integration/sasl_auth_multiple/controls/sasl_auth_multiple.rb b/test/integration/sasl_auth_multiple/controls/sasl_auth_multiple.rb index c205c84..58bbffe 100644 --- a/test/integration/sasl_auth_multiple/controls/sasl_auth_multiple.rb +++ b/test/integration/sasl_auth_multiple/controls/sasl_auth_multiple.rb @@ -7,8 +7,6 @@ relayhost1 kitchenuser:not-a-real-thing relayhost2 anotherkitchenuser:yet-not-a-real-thing - smtp_sasl_passwd : - smtp_sasl_user_name : EOF end end diff --git a/test/integration/sasl_auth_none/controls/sasl_auth_none.rb b/test/integration/sasl_auth_none/controls/sasl_auth_none.rb index 0634ca0..549da70 100644 --- a/test/integration/sasl_auth_none/controls/sasl_auth_none.rb +++ b/test/integration/sasl_auth_none/controls/sasl_auth_none.rb @@ -5,8 +5,7 @@ # Auto-generated by Chef. # Local modifications will be overwritten. - smtp_sasl_passwd : - smtp_sasl_user_name : + EOF end end diff --git a/test/integration/sasl_auth_one/controls/sasl_auth_one.rb b/test/integration/sasl_auth_one/controls/sasl_auth_one.rb index bab94a8..8eec322 100644 --- a/test/integration/sasl_auth_one/controls/sasl_auth_one.rb +++ b/test/integration/sasl_auth_one/controls/sasl_auth_one.rb @@ -6,8 +6,6 @@ # Local modifications will be overwritten. relayhost kitchenuser:not-a-real-thing - smtp_sasl_passwd : - smtp_sasl_user_name : EOF end end