move implicit defaults to docker-compose (#353)

Reson: some non-default configuration options are backed into the startup scripts. This can be unexpected when mounting files e.g. in a Kubernetes setup.

https://github.com/zokradonh/kopano-docker/issues/294

* core configuration
* fix compose for meet
* remove interpreter from start script
* use default oidc timeout

core/Dockerfile

@@ -28,7 +28,7 @@ ENV \
     RELEASE_KEY_DOWNLOAD=$RELEASE_KEY_DOWNLOAD
 
 LABEL maintainer=az@zok.xyz \
-    org.label-schema.name="Kopano core container" \
+    org.label-schema.name="Kopano Groupware Core container" \
     org.label-schema.description="Container for running applications out of Kopano Groupware Core" \
     org.label-schema.url="https://kopano.io" \
     org.label-schema.vcs-ref=$VCS_REF \

core/defaultconfigs/dagent.py

@@ -1,14 +1,12 @@
-import os
+#!/usr/bin/env python3
 import kcconf
 
 # Component specific configurations
 kcconf.configkopano({
     r"/tmp/kopano/dagent.cfg":
     {
-        'lmtp_listen': "0.0.0.0:2003",
-        'log_file': "-",
-        'log_level': "4",
-        'tmp_path': "/tmp/dagent/"
+        # Certain configuration can be pre-defined at startup:
+        #'lmtp_listen': "0.0.0.0:2003",
     }
 })
 

core/defaultconfigs/gateway.py

@@ -1,14 +1,12 @@
-import os
+#!/usr/bin/env python3
 import kcconf
 
 # Component specific configurations
 kcconf.configkopano({
     r"/tmp/kopano/gateway.cfg":
     {
-        'imap_listen': "0.0.0.0:143",
-        'log_file': "-",
-        'log_level': "3",
-        'tmp_path': "/tmp/gateway/"
+        # Certain configuration can be pre-defined at startup:
+        #'imap_listen': "0.0.0.0:143",
     }
 })
 

core/defaultconfigs/grapi.py

@@ -1,4 +1,4 @@
-import os
+#!/usr/bin/env python3
 import kcconf
 
 # Override configs from environment variables

core/defaultconfigs/ical.py

@@ -1,13 +1,12 @@
-import os
+#!/usr/bin/env python3
 import kcconf
 
 # Component specific configurations
 kcconf.configkopano({
     r"/tmp/kopano/ical.cfg":
     {
-        'ical_listen': "0.0.0.0:8080",
-        'log_file': "-",
-        'log_level': "3"
+        # Certain configuration can be pre-defined at startup:
+        #'ical_listen': "0.0.0.0:8080",
     }
 })
 

core/defaultconfigs/kapi.py

@@ -1,16 +1,12 @@
-import os
+#!/usr/bin/env python3
 import kcconf
 
 # Component specific configurations
 kcconf.configkopano({
     r"/tmp/kopano/kapid.cfg":
     {
-        'log_level': "info",
-        'listen': "0.0.0.0:8039",
-        'DEFAULT_PLUGIN_PUBS_SECRET_KEY_FILE': "/kopano/ssl/kapid-pubs-secret.key",
-        'plugin_kvs_db_datasource': "/kopano/data/kapi-kvs/kvs.db",
-        'plugin_grapi_socket_path': "/var/run/kopano/grapi"
-
+        # Certain configuration can be pre-defined at startup:
+        #'listen': "0.0.0.0:8039",
     }
 })
 

core/defaultconfigs/monitor.py

@@ -1,12 +1,12 @@
-import os
+#!/usr/bin/env python3
 import kcconf
 
 # Component specific configurations
 kcconf.configkopano({
     r"/tmp/kopano/monitor.cfg":
     {
-        'log_file': "-",
-        'log_level': "4"
+        # Certain configuration can be pre-defined at startup:
+        #'log_level': "4"
     }
 })
 

core/defaultconfigs/search.py

@@ -1,13 +1,12 @@
-import os
+#!/usr/bin/env python3
 import kcconf
 
 # Component specific configurations
 kcconf.configkopano({
     r"/tmp/kopano/search.cfg":
     {
-        'log_file': "-",
-        'log_level': "4",
-        'index_path': "/kopano/data/search/"
+        # Certain configuration can be pre-defined at startup:
+        #'index_path': "/kopano/data/search/"
     }
 })
 

core/defaultconfigs/server.py

@@ -1,20 +1,12 @@
-import os
+#!/usr/bin/env python3
 import kcconf
 
 # Component specific configurations
 kcconf.configkopano({
     r"/tmp/kopano/server.cfg":
     {
-        'attachment_path': "/kopano/data/attachments/",
-        'kcoidc_initialize_timeout': "360",
-        'log_file': "-",
-        'log_level': "3",
-        'server_listen_tls': "0.0.0.0:237",
-        'server_listen': "0.0.0.0:236",
-        'softdelete_lifetime': "0",
-        'sync_gab_realtime': "no",
-        'user_plugin_config': "/tmp/kopano/ldap.cfg",
-        'user_plugin': "ldap"
+        # Certain configuration can be pre-defined at startup:
+        #'server_listen': "0.0.0.0:236",
     }
 })
 

core/defaultconfigs/spooler.py

@@ -1,13 +1,12 @@
-import os
+#!/usr/bin/env python3
 import kcconf
 
 # Component specific configurations
 kcconf.configkopano({
     r"/tmp/kopano/spooler.cfg":
     {
-        'log_file': "-",
-        'log_level': "4",
-        'tmp_path': "/tmp/spooler/"
+        # Certain configuration can be pre-defined at startup:
+        #'log_level': "4",
     }
 })
 

core/start-service.sh

@@ -49,7 +49,7 @@ mkdir -p /tmp/"$SERVICE_TO_START" /var/run/kopano
 # TODO is this still required now that we won't modify configuration mounted to /etc/kopano?
 if [ "${DISABLE_CONFIG_CHANGES}" == false ]; then
 	echo "Configure core service '$SERVICE_TO_START'" | ts
-	/usr/bin/python3 /kopano/"$SERVICE_TO_START".py
+	/kopano/"$SERVICE_TO_START".py
 fi
 
 # ensure removed pid-file on unclean shutdowns and mounted volumes