From 6379f025a44def2eca4e3edf3880497d00167d53 Mon Sep 17 00:00:00 2001
From: Felix Bartels <1257835+fbartels@users.noreply.github.com>
Date: Wed, 2 Sep 2020 14:08:34 +0200
Subject: [PATCH] remove kopano-server pid from goss checks (#437)

* remove kopano-server pid from goss checks
* fix download location of trivy
---
 .ci/setup-tools.sh         | 4 ++--
 core/goss/server/goss.yaml | 9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.ci/setup-tools.sh b/.ci/setup-tools.sh
index 08cef0b..0460c9c 100755
--- a/.ci/setup-tools.sh
+++ b/.ci/setup-tools.sh
@@ -9,7 +9,7 @@ GOSS_VERSION=0.3.11
 HADOLINT_VERSION=1.17.6
 REG_VERSION=0.16.1
 SHELLCHECK_VERSION=0.7.1
-TRIVY_VERSION=0.6.0
+TRIVY_VERSION=0.11.0
 
 progname=$(basename "$0")
 tempdir=$(mktemp -d "/tmp/$progname.XXXXXX")
@@ -31,7 +31,7 @@ if ! command -v docker-compose > /dev/null; then
 fi
 
 if ! command -v trivy > /dev/null; then
-	wget https://github.com/knqyf263/trivy/releases/download/v${TRIVY_VERSION}/trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz
+	wget https://github.com/aquasecurity/trivy/releases/download/v${TRIVY_VERSION}/trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz
 	sudo tar zxvf trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz -C /usr/local/bin trivy
 fi
 
diff --git a/core/goss/server/goss.yaml b/core/goss/server/goss.yaml
index 5981560..4862a83 100644
--- a/core/goss/server/goss.yaml
+++ b/core/goss/server/goss.yaml
@@ -1,4 +1,5 @@
 file:
+  # TODO how to make path dynamic?
   /kopano/data/attachments/:
     exists: true
     mode: "0755"
@@ -11,12 +12,6 @@ file:
     owner: kopano
     group: kopano
     filetype: socket
-  /run/kopano/server.pid:
-    exists: true
-    mode: "0644"
-    owner: kopano
-    group: kopano
-    filetype: file
   /run/kopano/server.sock:
     exists: true
     mode: "0666"
@@ -27,9 +22,11 @@ process:
   kopano-server:
     running: true
 http:
+  # TODO what if plain http is deactivated? (or uses a different port?)
   http://localhost:236:
     status: 405
     timeout: 5000
+  # TODO what if ssl is deactivated? (or uses a different port?)
   https://localhost:237:
     status: 405
     allow-insecure: true