From 0f0885578573b7334189879774f5facb69c2f48a Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Tue, 17 Sep 2019 09:24:39 +0300 Subject: [PATCH] faq: mention EMAIL_DOMAIN_WHITELIST on allowing email domains (#8198) * faq: mention EMAIL_DOMAIN_WHITELIST on allowing email domains Signed-off-by: Mikaela Suomalainen * faq: separate openid from allow/block email domain Signed-off-by: Mikaela Suomalainen * faq: update ToC Signed-off-by: Mikaela Suomalainen * Update docs/content/doc/help/faq.en-us.md Co-Authored-By: John Olheiser <42128690+jolheiser@users.noreply.github.com> * Update docs/content/doc/help/faq.en-us.md Co-Authored-By: John Olheiser <42128690+jolheiser@users.noreply.github.com> --- docs/content/doc/help/faq.en-us.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/content/doc/help/faq.en-us.md b/docs/content/doc/help/faq.en-us.md index 1154141a0..4e4d1aeec 100644 --- a/docs/content/doc/help/faq.en-us.md +++ b/docs/content/doc/help/faq.en-us.md @@ -28,7 +28,8 @@ Also see [Support Options]({{< relref "doc/help/seek-help.en-us.md" >}}) * [What is Swagger?](#what-is-swagger) * [Adjusting your server for public/private use](#adjusting-your-server-for-public-private-use) * [Preventing spammers](#preventing-spammers) - * [Only allow/block certain email domains](#only-allow-block-certain-email-domains) + * [Only allow certain email domains](#only-allow-certain-email-domains) + * [Only allow/block certain OpenID providers](#only-allow-block-certain-openid-providers) * [Issue only users](#issue-only-users) * [Enable Fail2ban](#enable-fail2ban) * [Adding custom themes](#how-to-add-use-custom-themes) @@ -133,8 +134,11 @@ There are multiple things you can combine to prevent spammers. 2. Setting `ENABLE_CAPTCHA` to `true` in your `app.ini` and properly configuring `RECAPTCHA_SECRET` and `RECAPTCHA_SITEKEY` 3. Settings `DISABLE_REGISTRATION` to `true` and creating new users via the [CLI]({{< relref "doc/usage/command-line.en-us.md" >}}), [API]({{< relref "doc/advanced/api-usage.en-us.md" >}}), or Gitea's Admin UI -### Only allow/block certain email domains -If using OpenID, you can configure `WHITELISTED_URIS` or `BLACKLISTED_URIS` in your `app.ini` +### Only allow certain email domains +You can configure `EMAIL_DOMAIN_WHITELIST` in your app.ini under `[service]` + +### Only allow/block certain OpenID providers +You can configure `WHITELISTED_URIS` or `BLACKLISTED_URIS` under `[openid]` in your `app.ini` **NOTE:** whitelisted takes precedence, so if it is non-blank then blacklisted is ignored ### Issue only users