diff options
author | zeripath <art27@cantab.net> | 2021-05-13 23:11:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-13 23:11:47 +0100 |
commit | d234d37aa8377f22882c630036824f7a25e1c2a4 (patch) | |
tree | a44005b03e18af05f753b53a497239f824fe863e /options | |
parent | 9545c345a89639a673351644e5894adca0f8cfed (diff) | |
download | gitea-d234d37aa8377f22882c630036824f7a25e1c2a4.tar.gz gitea-d234d37aa8377f22882c630036824f7a25e1c2a4.zip |
Restore PAM user autocreation functionality (#15825)
* Restore PAM user autocreation functionality
PAM autoregistration of users currently fails due to email invalidity.
This PR adds a new setting to PAM to allow an email domain to be set
or just sets the email to the noreply address and if that fails falls
back to uuid@localhost
Fix #15702
Signed-off-by: Andrew Thornton <art27@cantab.net>
* As per KN4CKER
Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'options')
-rw-r--r-- | options/locale/locale_en-US.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 7e9229e1cd..936677e31d 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2313,6 +2313,7 @@ auths.allowed_domains_helper = Leave empty to allow all domains. Separate multip auths.enable_tls = Enable TLS Encryption auths.skip_tls_verify = Skip TLS Verify auths.pam_service_name = PAM Service Name +auths.pam_email_domain = PAM Email Domain (optional) auths.oauth2_provider = OAuth2 Provider auths.oauth2_icon_url = Icon URL auths.oauth2_clientID = Client ID (Key) |