diff options
| author | Monty Taylor <mordred@inaugust.com> | 2019-05-21 20:48:34 -0500 |
|---|---|---|
| committer | techknowlogick <techknowlogick@gitea.io> | 2019-05-21 21:48:34 -0400 |
| commit | 6eb53ac570ab9af51fc9cbd79f1db782edce57e0 (patch) | |
| tree | fb8a402071ab43c137bb99f801040efb7e09f7f5 | |
| parent | 0d69dfb4ca102186e68227dfca9eea1ce09e445b (diff) | |
| download | gitea-6eb53ac570ab9af51fc9cbd79f1db782edce57e0.tar.gz gitea-6eb53ac570ab9af51fc9cbd79f1db782edce57e0.zip | |
Fix documentation on Oauth2.Enable flag (#7011)
* Fix documentation on Oauth2.Enable flag
The docs list this as ENABLED, but in the source code it's
ENABLE, meaning following the docs leads to confusion.
* Update sample config for oauth2.ENABLE
| -rw-r--r-- | custom/conf/app.ini.sample | 2 | ||||
| -rw-r--r-- | docs/content/doc/advanced/config-cheat-sheet.en-us.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/custom/conf/app.ini.sample b/custom/conf/app.ini.sample index 599569464c..3ce7268d9d 100644 --- a/custom/conf/app.ini.sample +++ b/custom/conf/app.ini.sample @@ -698,7 +698,7 @@ DEFAULT_MAX_BLOB_SIZE = 10485760 [oauth2] ; Enables OAuth2 provider -ENABLED = true +ENABLE = true ; Lifetime of an OAuth2 access token in seconds ACCESS_TOKEN_EXPIRATION_TIME=3600 ; Lifetime of an OAuth2 access token in hours diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md index f40d35cdba..882f8a8a92 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md @@ -419,7 +419,7 @@ NB: You must `REDIRECT_MACARON_LOG` and have `DISABLE_ROUTER_LOG` set to `false` ## OAuth2 (`oauth2`) -- `ENABLED`: **true**: Enables OAuth2 provider. +- `ENABLE`: **true**: Enables OAuth2 provider. - `ACCESS_TOKEN_EXPIRATION_TIME`: **3600**: Lifetime of an OAuth2 access token in seconds - `REFRESH_TOKEN_EXPIRATION_TIME`: **730**: Lifetime of an OAuth2 access token in hours - `INVALIDATE_REFRESH_TOKEN`: **false**: Check if refresh token got already used |