summaryrefslogtreecommitdiffstats
path: root/docker-compose.yml
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2019-06-11 17:48:08 +0300
committerLauri Ojansivu <x@xet7.org>2019-06-11 17:48:08 +0300
commitf154c0338572fa09b3134d177c76e534c5947ed4 (patch)
tree524ea7c9396d54a93c9aeab989ac3bc86b018cc0 /docker-compose.yml
parent526e10865ff0c2c4465ead8ae14328ebf0d40257 (diff)
parente1e20275a673d3065c6cf239db8d2f1a505baa69 (diff)
downloadwekan-f154c0338572fa09b3134d177c76e534c5947ed4.tar.gz
wekan-f154c0338572fa09b3134d177c76e534c5947ed4.tar.bz2
wekan-f154c0338572fa09b3134d177c76e534c5947ed4.zip
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'docker-compose.yml')
-rw-r--r--docker-compose.yml6
1 files changed, 5 insertions, 1 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index 44e47b5f..3ab6cd69 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -239,6 +239,10 @@ services:
# ==== CORS =====
# CORS: Set Access-Control-Allow-Origin header.
#- CORS=*
+ # CORS_ALLOW_HEADERS: Set Access-Control-Allow-Headers header. "Authorization,Content-Type" is required for cross-origin use of the API.
+ #- CORS_ALLOW_HEADERS=Authorization,Content-Type
+ # CORS_EXPOSE_HEADERS: Set Access-Control-Expose-Headers header. This is not needed for typical CORS situations
+ #- CORS_EXPOSE_HEADERS=*
#-----------------------------------------------------------------
# ==== MATOMO INTEGRATION ====
# Optional: Integration with Matomo https://matomo.org that is installed to your server
@@ -327,7 +331,7 @@ services:
# OAUTH2 ID Token Whitelist Fields.
#- OAUTH2_ID_TOKEN_WHITELIST_FIELDS=[]
# OAUTH2 Request Permissions.
- #- OAUTH2_REQUEST_PERMISSIONS=['openid','profile','email']
+ #- OAUTH2_REQUEST_PERMISSIONS='openid profile email'
# OAuth2 ID Mapping
#- OAUTH2_ID_MAP=
# OAuth2 Username Mapping