Skip to content

A platform for community discussion. Free, open, simple.

FIX: Update sendmail config for Mail gem >=2.9.0 compatibility (#39688)

Chris Alberti5dd238174dc3
diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
index f6eed5da52e..f34e5bb1f7a 100644
--- a/app/models/global_setting.rb
+++ b/app/models/global_setting.rb
@@ -291,6 +291,10 @@ class GlobalSetting
end
end
+ def self.sendmail_settings
+ { arguments: %w[-i] }
+ end
+
class BaseProvider
def self.coerce(setting)
return setting == "true" if setting == "true" || setting == "false"
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 5f3009b95d7..911329b4b62 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -28,7 +28,7 @@ Discourse::Application.configure do
config.action_mailer.smtp_settings = smtp_settings
else
config.action_mailer.delivery_method = :sendmail
- config.action_mailer.sendmail_settings = { arguments: "-i" }
+ config.action_mailer.sendmail_settings = GlobalSetting.sendmail_settings
end
# Send deprecation notices to registered listeners
diff --git a/spec/integration/sendmail_spec.rb b/spec/integration/sendmail_spec.rb
new file mode 100644
index 00000000000..606210e0aac
--- /dev/null
+++ b/spec/integration/sendmail_spec.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+RSpec.describe "Sendmail Settings Integration" do
+ it "configures arguments as an Array, not a String (mail gem >= 2.9.0 compatibility)" do
+ expect(GlobalSetting.sendmail_settings[:arguments]).to be_an(Array)
+ end
+
+ it "does not raise an error when initialising Sendmail with the default settings" do
+ expect { Mail::Sendmail.new(GlobalSetting.sendmail_settings) }.not_to raise_error
+ end
+end