From a256e639b0800651b4cdeea18a9b7a6a84d50efb Mon Sep 17 00:00:00 2001 From: Greg Karekinian Date: Tue, 9 Sep 2025 14:49:55 +0200 Subject: [PATCH 1/3] Remove ancient attribute See https://github.com/sous-chefs/postfix/issues/148 --- recipes/_attributes.rb | 2 -- 1 file changed, 2 deletions(-) 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 From b895c8990e95c792124f93211e42eb3557d0da1a Mon Sep 17 00:00:00 2001 From: Greg Karekinian Date: Tue, 9 Sep 2025 23:00:25 +0200 Subject: [PATCH 2/3] Fix tests --- .../sasl_auth_multiple/controls/sasl_auth_multiple.rb | 2 -- test/integration/sasl_auth_none/controls/sasl_auth_none.rb | 3 --- test/integration/sasl_auth_one/controls/sasl_auth_one.rb | 2 -- 3 files changed, 7 deletions(-) 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..63da03e 100644 --- a/test/integration/sasl_auth_none/controls/sasl_auth_none.rb +++ b/test/integration/sasl_auth_none/controls/sasl_auth_none.rb @@ -4,9 +4,6 @@ should cmp <<~EOF # 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 From 3f39c7d83caf8e5146d8b58b5117d5fdf27f2608 Mon Sep 17 00:00:00 2001 From: Greg Karekinian Date: Wed, 10 Sep 2025 09:46:13 +0200 Subject: [PATCH 3/3] Try to fix integration test --- test/integration/sasl_auth_none/controls/sasl_auth_none.rb | 2 ++ 1 file changed, 2 insertions(+) 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 63da03e..549da70 100644 --- a/test/integration/sasl_auth_none/controls/sasl_auth_none.rb +++ b/test/integration/sasl_auth_none/controls/sasl_auth_none.rb @@ -4,6 +4,8 @@ should cmp <<~EOF # Auto-generated by Chef. # Local modifications will be overwritten. + + EOF end end