From 485298bb76a75da0c5b73d190a6563cad2f984c3 Mon Sep 17 00:00:00 2001
From: Felix Bartels <felix@host-consultants.de>
Date: Tue, 18 Dec 2018 11:09:07 +0100
Subject: [PATCH] add quick-test to makefile fix socker for ical and gateway
 enable non-ssl gateway and remove ssl options from docker-compose ssl for
 gateway could be implemented as part of
 https://github.com/zokradonh/kopano-docker/issues/16

Signed-off-by: Felix Bartels <felix@host-consultants.de>
---
 Makefile                       | 6 ++++++
 core/defaultconfigs/gateway.py | 7 ++-----
 docker-compose.yml-example     | 7 +++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 6bfd00a..b1c65d8 100644
--- a/Makefile
+++ b/Makefile
@@ -119,3 +119,9 @@ test:
 	make build-all
 	docker-compose build
 	docker-compose up -d
+	docker-compose ps
+
+test-quick:
+	docker-compose stop || true
+	docker-compose up -d
+	docker-compose ps
diff --git a/core/defaultconfigs/gateway.py b/core/defaultconfigs/gateway.py
index 86454c4..025254a 100644
--- a/core/defaultconfigs/gateway.py
+++ b/core/defaultconfigs/gateway.py
@@ -6,11 +6,8 @@ kcconf.configkopano({
     r"/etc/kopano/gateway.cfg":
     {
         'log_file': "-",
-        'log_level': "4",
-        'tmp_path': "/tmp/gateway/",
-        'pop3_listen': "",
-        'imap_listen': "",
-        'imaps_listen': "*:993"
+        'log_level': "3",
+        'tmp_path': "/tmp/gateway/"
     }
 })
 
diff --git a/docker-compose.yml-example b/docker-compose.yml-example
index eb3becd..ee39d05 100644
--- a/docker-compose.yml-example
+++ b/docker-compose.yml-example
@@ -253,9 +253,8 @@ services:
     environment:
       - SERVICE_TO_START=gateway
       - TZ=${TZ}
-      - KCCONF_GATEWAY_SERVER_SOCKET=http://kserver:236/
-      - KCCONF_GATEWAY_SSL_PRIVATE_KEY_FILE=/kopano/certs/yourcert.key # change here
-      - KCCONF_GATEWAY_SSL_CERTIFICATE_FILE=/kopano/certs/yourcert.pem # change here
+      - KCCONF_GATEWAY_SERVER_SOCKET=http://kopano_server:236/
+      - KCCONF_GATEWAY_LOG_LEVEL=6
     networks:
       - kopanonet
 
@@ -270,7 +269,7 @@ services:
     environment:
       - SERVICE_TO_START=ical
       - TZ=${TZ}
-      - KCCONF_ICAL_SERVER_SOCKET=http://kserver:236/
+      - KCCONF_ICAL_SERVER_SOCKET=http://kopano_server:236/
     networks:
       - kopanonet