diff options
| author | zeripath <art27@cantab.net> | 2019-02-03 02:06:52 +0000 |
|---|---|---|
| committer | techknowlogick <matti@mdranta.net> | 2019-02-02 21:06:52 -0500 |
| commit | 3d91bb2f2dc8584b76a49a1a40c3f688c21380f5 (patch) | |
| tree | 5f5641012972139a1fb179a5415cab38c222a68a /docs/content | |
| parent | 67567eff0e5614553cbd396ae7e1adfde6fa33c0 (diff) | |
| download | gitea-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 'docs/content')
| -rw-r--r-- | docs/content/doc/advanced/config-cheat-sheet.en-us.md | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md index 7d7f4d9e0a..c2d22f1d83 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md @@ -228,10 +228,14 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`. - `PASSWD`: **\<empty\>**: Password of mailing user. Use \`your password\` for quoting if you use special characters in the password. - `SKIP_VERIFY`: **\<empty\>**: Do not verify the self-signed certificates. - **Note:** Gitea only supports SMTP with STARTTLS. -- `USE_SENDMAIL`: **false** Use the operating system's `sendmail` command instead of SMTP. +- `MAILER_TYPE`: **smtp**: \[smtp, sendmail, dummy\] + - **smtp** Use SMTP to send mail + - **sendmail** Use the operating system's `sendmail` command instead of SMTP. This is common on linux systems. + - **dummy** Send email messages to the log as a testing phase. - Note that enabling sendmail will ignore all other `mailer` settings except `ENABLED`, `FROM` and `SENDMAIL_PATH`. + - Enabling dummy will ignore all settings except `ENABLED` and `FROM`. - `SENDMAIL_PATH`: **sendmail**: The location of sendmail on the operating system (can be command or full path). - ``IS_TLS_ENABLED`` : **false** : Decide if SMTP connections should use TLS. |