From a95a1f9b145face0c6fd219f004c32d68e0c5fe5 Mon Sep 17 00:00:00 2001
From: Felix Bartels <felix@host-consultants.de>
Date: Sat, 23 Mar 2019 19:38:20 +0100
Subject: [PATCH] properly fix non ssl startup for meet

Signed-off-by: Felix Bartels <felix@host-consultants.de>
---
 docker-compose.yml            | 1 -
 meet/defaultconfigs/meet.py   | 9 ---------
 meet/start-service.sh         | 1 +
 tests/startup-test/Dockerfile | 2 +-
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index d775f91..3680790 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -481,7 +481,6 @@ services:
     image: ${docker_repo:-zokradonh}/kopano_meet:${MEET_VERSION:-latest}
     environment:
      - SERVICE_TO_START=meet
-     - KCCONF_KWEBD_TLS=no
      - KCCONF_MEET_guests_enabled=true
      - KCCONF_MEET_disableFullGAB=false
     env_file:
diff --git a/meet/defaultconfigs/meet.py b/meet/defaultconfigs/meet.py
index 13a5a54..48407c7 100644
--- a/meet/defaultconfigs/meet.py
+++ b/meet/defaultconfigs/meet.py
@@ -1,14 +1,5 @@
 import os
 import kcconf
 
-# Component specific configurations
-kcconf.configkopano({
-    r"/etc/kopano/kweb.cfg":
-    {
-        'tls': "no"
-
-    }
-})
-
 # Override configs from environment variables
 kcconf.configkopano(kcconf.parseenvironmentvariables(r"/etc/kopano/"))
diff --git a/meet/start-service.sh b/meet/start-service.sh
index 00b61ba..f22c7be 100755
--- a/meet/start-service.sh
+++ b/meet/start-service.sh
@@ -32,6 +32,7 @@ jq '.apps += {"enabled": ["kopano-webapp"]}' $CONFIG_JSON | sponge $CONFIG_JSON
 #cat $CONFIG_JSON
 
 sed -i s/\ *=\ */=/g /etc/kopano/kwebd.cfg
+export tls=no
 # shellcheck disable=SC2046
 export $(grep -v '^#' /etc/kopano/kwebd.cfg | xargs -d '\n')
 # cleaning up env variables
diff --git a/tests/startup-test/Dockerfile b/tests/startup-test/Dockerfile
index c242254..2b5afbf 100644
--- a/tests/startup-test/Dockerfile
+++ b/tests/startup-test/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.8
+FROM alpine:3.9
 
 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 \