Add Kopano Meet and depending instrastructure to meet

Makefile adjustments
reorder Makefile
adds image for kwmserver
adds image for meet
add Meet to compose
clean up proxy configuration
move kcconf.py into the base image

konnect/Dockerfile

@@ -1,4 +1,4 @@
-ARG CODE_VERSION=0.16.1
+ARG CODE_VERSION=0.19.1
 FROM kopano/konnectd:${CODE_VERSION}
 ARG CODE_VERSION
 ENV CODE_VERSION="${CODE_VERSION}"
@@ -13,5 +13,5 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
     && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
 
 RUN mkdir -p /etc/kopano/
-COPY identifier-registration.yaml /etc/kopano
+COPY konnectd-identifier-registration.yaml konnectd-identifier-scopes.yaml /etc/kopano/
 COPY wrapper.sh /usr/local/bin

konnect/konnectd-identifier-scopes.yaml

@@ -0,0 +1,14 @@
+# This file contains additional scopes for Konnect. All of the scopes listed
+# here are made available to clients upon request if not limited by other means.
+
+---
+scopes:
+  kopano/kwm:
+    description: "Access Kopano Meet"
+
+  kopano/kvs:
+    description: "Access Kopano Key Value Store"
+
+  kopano/pubs:
+    description: "Access Kopano Pub/Sub"
+

konnect/wrapper.sh

@@ -5,10 +5,11 @@ set -e
 dockerize \
 	-wait file:///kopano/ssl/konnectd-tokens-signing-key.pem \
 	-wait file:///kopano/ssl/konnectd-encryption.key \
-	-timeout 360s
-exec konnectd serve \
+	-timeout 360s \
+	konnectd serve \
 	--signing-private-key=/kopano/ssl/konnectd-tokens-signing-key.pem \
 	--encryption-secret=/kopano/ssl/konnectd-encryption.key \
 	--iss=https://$FQDN \
-	--identifier-registration-conf /etc/kopano/identifier-registration.yaml \
+	--identifier-registration-conf /etc/kopano/konnectd-identifier-registration.yaml \
+	--identifier-scopes-conf /etc/kopano/konnectd-identifier-scopes.yaml \
 	kc