From 7eeea1944c5a1103c4285fa02f3a064fa50eeec1 Mon Sep 17 00:00:00 2001
From: Felix Bartels <1257835+fbartels@users.noreply.github.com>
Date: Thu, 27 Feb 2020 15:23:13 +0100
Subject: [PATCH] repair health check for kopano-webapp and kopano-meet (#344)

* json output in the healtcheck is hard to read

Signed-off-by: Felix Bartels <felix@host-consultants.de>

* fix meet health check after moving json to /tmp

Signed-off-by: Felix Bartels <felix@host-consultants.de>

* fix webapp health check

Signed-off-by: Felix Bartels <felix@host-consultants.de>
---
 meet/Dockerfile      | 2 +-
 meet/goss.yaml       | 2 +-
 scheduler/Dockerfile | 2 +-
 webapp/Dockerfile    | 2 +-
 webapp/goss.yaml     | 3 ---
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/meet/Dockerfile b/meet/Dockerfile
index 1b670a7..7853f67 100644
--- a/meet/Dockerfile
+++ b/meet/Dockerfile
@@ -59,5 +59,5 @@ COPY goss.yaml /goss/
 CMD [ "/kopano/start-service.sh" ]
 
 HEALTHCHECK --interval=1m --timeout=10s \
-    CMD goss -g /goss/goss.yaml validate --format json_oneline
+    CMD goss -g /goss/goss.yaml validate
 
diff --git a/meet/goss.yaml b/meet/goss.yaml
index d4be8e5..2382636 100644
--- a/meet/goss.yaml
+++ b/meet/goss.yaml
@@ -1,5 +1,5 @@
 file:
-  /usr/share/kopano-kweb/www/config/kopano/meet.json:
+  /tmp/meet.json:
     exists: true
     mode: "0644"
     owner: root
diff --git a/scheduler/Dockerfile b/scheduler/Dockerfile
index bc5110c..b0aeedd 100644
--- a/scheduler/Dockerfile
+++ b/scheduler/Dockerfile
@@ -42,4 +42,4 @@ CMD ["start.sh"]
 
 # TODO interval does not only define how often the healtcheck is run, but also how long to wait for the first check after startup
 HEALTHCHECK --interval=60m --timeout=15s \
-    CMD goss -g /goss/goss.yaml validate --format json_oneline
\ No newline at end of file
+    CMD goss -g /goss/goss.yaml validate
\ No newline at end of file
diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index ae6e2b3..b4c0850 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -82,4 +82,4 @@ ENTRYPOINT ["/usr/bin/dumb-init", "--"]
 CMD [ "/kopano/start.sh" ]
 
 HEALTHCHECK --interval=1m --timeout=10s \
-    CMD goss -g /goss/goss.yaml validate --format json_oneline
+    CMD goss -g /goss/goss.yaml validate
diff --git a/webapp/goss.yaml b/webapp/goss.yaml
index f45d3db..0248f77 100644
--- a/webapp/goss.yaml
+++ b/webapp/goss.yaml
@@ -1,12 +1,9 @@
 file:
   /run/sessions:
     exists: true
-    mode: "0755"
-    size: 4096
     owner: www-data
     group: www-data
     filetype: directory
-    contains: []
   /usr/lib/php/20180731/mapi.so:
     exists: true
     mode: "0644"