summaryrefslogtreecommitdiffstats
path: root/docker-compose.yml
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2019-02-13 03:17:04 +0200
committerLauri Ojansivu <x@xet7.org>2019-02-13 03:17:04 +0200
commitd5593e059b8b2a4b3e515a9cf9f5933459f37020 (patch)
tree5908c6eacaa71cfa8a24215c7d271a7bd010a506 /docker-compose.yml
parent93ae4e504e4fa5b05ca89028e3185c23e4e36556 (diff)
parentdc7bbd848c9a194dac4d5511618265dec1012897 (diff)
downloadwekan-d5593e059b8b2a4b3e515a9cf9f5933459f37020.tar.gz
wekan-d5593e059b8b2a4b3e515a9cf9f5933459f37020.tar.bz2
wekan-d5593e059b8b2a4b3e515a9cf9f5933459f37020.zip
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'docker-compose.yml')
-rw-r--r--docker-compose.yml11
1 files changed, 9 insertions, 2 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index 869415a8..a9f11569 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -191,9 +191,12 @@ services:
# - MONGO_OPLOG_URL=mongodb://<username>:<password>@<mongoDbURL>/local?authSource=admin&replicaSet=rsWekan
#---------------------------------------------------------------
# ==== OPTIONAL: KADIRA PERFORMANCE MONITORING FOR METEOR ====
- # https://github.com/smeijer/kadira
+ # https://github.com/edemaine/kadira-compose
+ # https://github.com/meteor/meteor-apm-agent
# https://blog.meteor.com/kadira-apm-is-now-open-source-490469ffc85f
- # - export KADIRA_OPTIONS_ENDPOINT=http://127.0.0.1:11011
+ #- APM_OPTIONS_ENDPOINT=http://<kadira-ip>:11011
+ #- APM_APP_ID=
+ #- APM_APP_SECRET=
#---------------------------------------------------------------
# ==== OPTIONAL: LOGS AND STATS ====
# https://github.com/wekan/wekan/wiki/Logs
@@ -308,6 +311,10 @@ services:
#- OAUTH2_FULLNAME_MAP=
# OAuth2 Email Mapping
#- OAUTH2_EMAIL_MAP=
+ # OAUTH2 ID Token Whitelist Fields.
+ #- OAUTH2_ID_TOKEN_WHITELIST_FIELDS=[]
+ # OAUTH2 Request Permissions.
+ #- OAUTH2_REQUEST_PERMISSIONS=[openid email profile]
#-----------------------------------------------------------------
# ==== LDAP ====
# https://github.com/wekan/wekan/wiki/LDAP