aboutsummaryrefslogtreecommitdiffstats
path: root/options/locale
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2021-08-11 21:42:58 +0100
committerGitHub <noreply@github.com>2021-08-11 21:42:58 +0100
commite29e1637370ad95e4ca9f861c25d366b74829dcc (patch)
tree63c0b53fa958b23fdf1f3e5216df250a24016706 /options/locale
parentf1a810e0901b80eb6bc21103434fc0737af17eaa (diff)
downloadgitea-e29e1637370ad95e4ca9f861c25d366b74829dcc.tar.gz
gitea-e29e1637370ad95e4ca9f861c25d366b74829dcc.zip
Improve SMTP authentication and Fix user creation bugs (#16612)
* Improve SMTP authentication, Fix user creation bugs and add LDAP cert/key options This PR has two parts: Improvements for SMTP authentication: * Default to use SMTPS if port is 465, and allow setting of force SMTPS. * Always use STARTTLS if available * Provide CRAM-MD5 mechanism * Add options for HELO hostname disabling * Add options for providing certificates and keys * Handle application specific password response as a failed user login instead of as a 500. Close #16104 Fix creation of new users: * A bug was introduced when allowing users to change usernames which prevents the creation of external users. * The LoginSource refactor also broke this page. Close #16104 Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'options/locale')
-rw-r--r--options/locale/locale_en-US.ini6
1 files changed, 5 insertions, 1 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index ccf19293ff..9ec7061577 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -2427,8 +2427,12 @@ auths.smtphost = SMTP Host
auths.smtpport = SMTP Port
auths.allowed_domains = Allowed Domains
auths.allowed_domains_helper = Leave empty to allow all domains. Separate multiple domains with a comma (',').
-auths.enable_tls = Enable TLS Encryption
auths.skip_tls_verify = Skip TLS Verify
+auths.force_smtps = Force SMTPS
+auths.force_smtps_helper = By default SMTPS will be used for port 465, set this to use smtps on other ports, otherwise STARTTLS is used if supported.
+auths.helo_hostname = HELO Hostname
+auths.helo_hostname_helper = Hostname sent with HELO. Leave blank to send current hostname.
+auths.disable_helo = Disable HELO
auths.pam_service_name = PAM Service Name
auths.pam_email_domain = PAM Email Domain (optional)
auths.oauth2_provider = OAuth2 Provider