Kopano spamd, Bugfixes (#17)

* Add container for kopano-spamd
* Authenticate version requests if needed
* Fix building of z-push for 'supported' base image
* Install kopano-spamd package by default
* Smaller fixes for kopano-spamd
* Fix missing file header
* simplify netrc usage

core/Dockerfile

@@ -47,7 +47,7 @@ RUN --mount=type=secret,id=repocred,target=/etc/apt/auth.conf.d/kopano.conf \
     apt-get update && \
     set -x && \
     apt-get -o Debug::pkgProblemResolver=true install --no-install-recommends -y \
-        kopano-server-packages \
+        kopano-server-packages kopano-spamd \
         ${ADDITIONAL_KOPANO_PACKAGES} \
         && \
     coreversion=$(dpkg-query --showformat='${Version}' --show kopano-server) && \

core/defaultconfigs/spamd.py

@@ -0,0 +1,15 @@
+#!/usr/bin/env python3
+import os
+import kcconf
+
+# Component specific configurations
+kcconf.configkopano({
+    r"/tmp/kopano/spamd.cfg":
+    {
+        # Certain configuration can be pre-defined at startup:
+        #'log_level': "3"
+    }
+})
+
+# Override configs from environment variables
+kcconf.configkopano(kcconf.parseenvironmentvariables(r"/tmp/kopano/"))

core/goss/spamd/goss.yaml

@@ -0,0 +1,3 @@
+process:
+  kopano-spamd:
+    running: true

core/goss/spamd/goss_wait.yaml

@@ -0,0 +1,3 @@
+process:
+  kopano-spamd:
+    running: true

core/start-service.sh

@@ -104,6 +104,9 @@ search)
 server)
 	EXE="${EXE:-$(command -v kopano-server)}"
 	;;
+spamd)
+	EXE="${EXE:-$(command -v kopano-spamd)}"
+	;;
 spooler)
 	EXE="${EXE:-$(command -v kopano-spooler)}"
 	KOPANO_CON="$KCCONF_SPOOLER_SERVER_SOCKET"
@@ -246,6 +249,14 @@ search)
 		exec /usr/bin/python3 "$EXE" --config /tmp/kopano/search.cfg -F
 	fi
 	;;
+spamd)
+	dockerize \
+		-wait "$KOPANO_CON" \
+		-timeout 360s
+	# cleaning up env variables
+	unset "${!KCCONF_@}"
+	exec "$EXE" --config /tmp/kopano/spamd.cfg -F
+	;;
 spooler)
 	dockerize \
 		-wait "$KOPANO_CON" \