Merge pull request #237025 from SuperSandro2000/zammad-sendmail

This commit is contained in:
Sandro 2023-06-14 14:25:50 +02:00 committed by GitHub
commit 2c117a4e1b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions

View file

@ -28,7 +28,10 @@ let
src = fetchFromGitHub (lib.importJSON ./source.json);
patches = [ ./0001-nulldb.patch ];
patches = [
./0001-nulldb.patch
./fix-sendmail-location.diff
];
postPatch = ''
sed -i -e "s|ruby '3.1.[0-9]\+'|ruby '${ruby.version}'|" Gemfile

View file

@ -0,0 +1,12 @@
diff --git a/app/models/channel/driver/sendmail.rb b/app/models/channel/driver/sendmail.rb
index b15ef48a6..64c120a87 100644
--- a/app/models/channel/driver/sendmail.rb
+++ b/app/models/channel/driver/sendmail.rb
@@ -32,6 +32,6 @@ def delivery_method(mail)
return mail.delivery_method :test if Rails.env.test?
- mail.delivery_method :sendmail
+ mail.delivery_method :sendmail, :location => '/run/wrappers/bin/sendmail'
end
end