diff options
| author | zeripath <art27@cantab.net> | 2022-11-27 10:08:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-27 10:08:40 +0000 |
| commit | f6fd501841816f5e5c1c9a30fbc4c9a2a6f987bc (patch) | |
| tree | 8f8919a0daec62f9d41827fcbf5f87ea6617a7ce /custom/conf | |
| parent | 32590db4cafe8fea30be3d19ba0f179f06a35427 (diff) | |
| download | gitea-f6fd501841816f5e5c1c9a30fbc4c9a2a6f987bc.tar.gz gitea-f6fd501841816f5e5c1c9a30fbc4c9a2a6f987bc.zip | |
Correct the fallbacks for mailer configuration (#21945)
Unfortunately the fallback configuration code for [mailer] that were
added in #18982 are incorrect. When you read a value from an ini section
that key is added. This leads to a failure of the fallback mechanism.
Further there is also a spelling mistake in the startTLS configuration.
This PR restructures the mailer code to first map the deprecated
settings on to the new ones - and then use ini.MapTo to map those on to
the struct with additional validation as necessary.
Ref #21744
Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'custom/conf')
| -rw-r--r-- | custom/conf/app.example.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index e7ddda4b8a..5822dc1e4a 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -1590,7 +1590,7 @@ ROUTER = console ;; Prefix displayed before subject in mail ;SUBJECT_PREFIX = ;; -;; Mail server protocol. One of "smtp", "smtps", "smtp+startls", "smtp+unix", "sendmail", "dummy". +;; Mail server protocol. One of "smtp", "smtps", "smtp+starttls", "smtp+unix", "sendmail", "dummy". ;; - 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. ;; If your provider does not explicitly say which protocol it uses but does provide a port, |