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 /templates | |
| 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 'templates')
| -rw-r--r-- | templates/admin/auth/edit.tmpl | 4 | ||||
| -rw-r--r-- | templates/admin/auth/new.tmpl | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index e14c3be761..e4d7a2e1e1 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -188,6 +188,10 @@ <label for="pam_service_name">{{.i18n.Tr "admin.auths.pam_service_name"}}</label> <input id="pam_service_name" name="pam_service_name" value="{{$cfg.ServiceName}}" required> </div> + <div class="field"> + <label for="pam_email_domain">{{.i18n.Tr "admin.auths.pam_email_domain"}}</label> + <input id="pam_email_domain" name="pam_email_domain" value="{{$cfg.EmailDomain}}"> + </div> {{end}} <!-- OAuth2 --> diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl index 36a5d2c632..302132e06b 100644 --- a/templates/admin/auth/new.tmpl +++ b/templates/admin/auth/new.tmpl @@ -38,6 +38,8 @@ <div class="pam required field {{if not (eq .type 4)}}hide{{end}}"> <label for="pam_service_name">{{.i18n.Tr "admin.auths.pam_service_name"}}</label> <input id="pam_service_name" name="pam_service_name" value="{{.pam_service_name}}" /> + <label for="pam_email_domain">{{.i18n.Tr "admin.auths.pam_email_domain"}}</label> + <input id="pam_email_domain" name="pam_email_domain" value="{{.pam_email_domain}}"> </div> <!-- OAuth2 --> |