From b3af961c1340c21bfea8b70a9ca4d3db22127e34 Mon Sep 17 00:00:00 2001 From: Felix Bartels Date: Thu, 7 Mar 2019 14:33:28 +0100 Subject: [PATCH] update meet config Signed-off-by: Felix Bartels --- meet/Dockerfile | 1 + meet/start-service.sh | 2 ++ web/kweb.cfg | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/meet/Dockerfile b/meet/Dockerfile index 11cf47c..b84b49f 100644 --- a/meet/Dockerfile +++ b/meet/Dockerfile @@ -32,6 +32,7 @@ RUN \ kopano-meet kopano-meet-webapp \ ${ADDITIONAL_KOPANO_PACKAGES} \ && \ + cp /usr/share/doc/kopano-meet-webapp/config.json.in /usr/share/kopano-kweb/www/config/kopano/meet.json && \ set +x && \ rm -rf /var/cache/apt /var/lib/apt/lists diff --git a/meet/start-service.sh b/meet/start-service.sh index f2d4b2c..552e6b8 100755 --- a/meet/start-service.sh +++ b/meet/start-service.sh @@ -18,6 +18,8 @@ if [ $# -gt 0 ]; then exit fi +# TODO use jq to modify /usr/share/kopano-kweb/www/config/kopano/meet.json + sed -i s/\ *=\ */=/g /etc/kopano/kwebd.cfg export $(grep -v '^#' /etc/kopano/kwebd.cfg | xargs -d '\n') # cleaning up env variables diff --git a/web/kweb.cfg b/web/kweb.cfg index d4a9e06..80b191a 100644 --- a/web/kweb.cfg +++ b/web/kweb.cfg @@ -22,7 +22,7 @@ } # Config - proxy /api/config/v1/kopano/ http://kopano_meet:9080/ { + proxy /api/config/v1/kopano/meet/ http://kopano_meet:9080/ { fail_timeout 10s try_duration 30s transparent