flywithu/kopano-docker
1
0
Fork 0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-10-31 10:27:14 +00:00
Code Issues Releases Wiki Activity

properly fix non ssl startup for meet

Browse Source 
Signed-off-by: Felix Bartels <felix@host-consultants.de>
This commit is contained in:
Felix Bartels 2019-03-23 19:38:20 +01:00
parent b5e6f0fecf
commit a95a1f9b14
4 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker-compose.yml
View File

@ -481,7 +481,6 @@ services:
image: ${docker_repo:-zokradonh}/kopano_meet:${MEET_VERSION:-latest} image: ${docker_repo:-zokradonh}/kopano_meet:${MEET_VERSION:-latest}
environment: environment:
- SERVICE_TO_START=meet - SERVICE_TO_START=meet
- KCCONF_KWEBD_TLS=no
- KCCONF_MEET_guests_enabled=true - KCCONF_MEET_guests_enabled=true
- KCCONF_MEET_disableFullGAB=false - KCCONF_MEET_disableFullGAB=false
env_file: env_file:

9
meet/defaultconfigs/meet.py
View File

@ -1,14 +1,5 @@
import os import os
import kcconf import kcconf
# Component specific configurations
kcconf.configkopano({
r"/etc/kopano/kweb.cfg":
{
'tls': "no"
}
})
# Override configs from environment variables # Override configs from environment variables
kcconf.configkopano(kcconf.parseenvironmentvariables(r"/etc/kopano/")) kcconf.configkopano(kcconf.parseenvironmentvariables(r"/etc/kopano/"))

1
meet/start-service.sh
View File

@ -32,6 +32,7 @@ jq '.apps += {"enabled": ["kopano-webapp"]}' $CONFIG_JSON | sponge $CONFIG_JSON
#cat $CONFIG_JSON #cat $CONFIG_JSON
sed -i s/\ *=\ */=/g /etc/kopano/kwebd.cfg sed -i s/\ *=\ */=/g /etc/kopano/kwebd.cfg
export tls=no
# shellcheck disable=SC2046 # shellcheck disable=SC2046
export $(grep -v '^#' /etc/kopano/kwebd.cfg | xargs -d '\n') export $(grep -v '^#' /etc/kopano/kwebd.cfg | xargs -d '\n')
# cleaning up env variables # cleaning up env variables

2
tests/startup-test/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.8 FROM alpine:3.9
ENV DOCKERIZE_VERSION v0.6.1 ENV DOCKERIZE_VERSION v0.6.1
RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \