diff options
| author | Sheogorath | 2020-02-09 13:48:26 +0100 |
|---|---|---|
| committer | Sheogorath | 2020-02-09 13:48:26 +0100 |
| commit | d5ae45b268452f315926bc4a8ded83e112603d0c (patch) | |
| tree | 9e3b5cff1f93ec6dcda13a29421f7ae4248185cd /docs | |
| parent | b3d4cdbcebe1690bf5211d778ff6f8a0f9f5e518 (diff) | |
| parent | 78682f57c43c8af8abccc60848df4d7533dabc60 (diff) | |
Merge branch 'google-oauth'
See https://github.com/codimd/server/pull/265
Diffstat (limited to '')
| -rw-r--r-- | docs/configuration-config-file.md | 2 | ||||
| -rw-r--r-- | docs/configuration-env-vars.md | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/docs/configuration-config-file.md b/docs/configuration-config-file.md index c1114549..9fe4554d 100644 --- a/docs/configuration-config-file.md +++ b/docs/configuration-config-file.md @@ -134,7 +134,7 @@ these are rarely used for various reasons. | variables | example values | description | | --------- | ------ | ----------- | -| `google` | `{clientID: ..., clientSecret: ...}` | An object containing the client ID and the client secret obtained by the [Google API console](https://console.cloud.google.com/apis) | +| `google` | `{clientID: ..., clientSecret: ..., hostedDomain: ...}` | An object containing the client ID and the client secret obtained by the [Google API console](https://console.cloud.google.com/apis) | ### LDAP Login diff --git a/docs/configuration-env-vars.md b/docs/configuration-env-vars.md index f391f362..6ac9123b 100644 --- a/docs/configuration-env-vars.md +++ b/docs/configuration-env-vars.md @@ -135,6 +135,7 @@ defaultNotePath can't be set from env-vars | -------- | ------------- | ----------- | | `CMD_GOOGLE_CLIENTID` | no example | Google API client id | | `CMD_GOOGLE_CLIENTSECRET` | no example | Google API client secret | +| `CMD_GOOGLE_HOSTEDDOMAIN` | `example.com` | Provided only if the user belongs to a hosted domain. default is `undefined` | ### LDAP Login |