aboutsummaryrefslogtreecommitdiffstats
path: root/custom/conf
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2019-02-03 02:06:52 +0000
committertechknowlogick <matti@mdranta.net>2019-02-02 21:06:52 -0500
commit3d91bb2f2dc8584b76a49a1a40c3f688c21380f5 (patch)
tree5f5641012972139a1fb179a5415cab38c222a68a /custom/conf
parent67567eff0e5614553cbd396ae7e1adfde6fa33c0 (diff)
downloadgitea-3d91bb2f2dc8584b76a49a1a40c3f688c21380f5.tar.gz
gitea-3d91bb2f2dc8584b76a49a1a40c3f688c21380f5.zip
Make log mailer for testing (#5893)
* Create log mailer for testing email settings Signed-off-by: Andrew Thornton <art27@cantab.net> * Switch on the log mailer for the integration tests This ensures that the sending mail process works Signed-off-by: Andrew Thornton <art27@cantab.net> * rename the from user for mysql/mssql * rename log sender to dummy sender * update the integration tests
Diffstat (limited to 'custom/conf')
-rw-r--r--custom/conf/app.ini.sample4
1 files changed, 2 insertions, 2 deletions
diff --git a/custom/conf/app.ini.sample b/custom/conf/app.ini.sample
index 6b46456f4e..aebcfafa96 100644
--- a/custom/conf/app.ini.sample
+++ b/custom/conf/app.ini.sample
@@ -414,8 +414,8 @@ USER =
PASSWD =
; Send mails as plain text
SEND_AS_PLAIN_TEXT = false
-; Enable sendmail (override SMTP)
-USE_SENDMAIL = false
+; Set Mailer Type (either SMTP, sendmail or dummy to just send to the log)
+MAILER_TYPE = smtp
; Specify an alternative sendmail binary
SENDMAIL_PATH = sendmail
; Specify any extra sendmail arguments