From 34247239b58fec80308d5bbe0bf086b82ffa9f59 Mon Sep 17 00:00:00 2001 From: mlan Date: Tue, 3 Nov 2020 17:18:39 +0100 Subject: [PATCH] - [kopano](src/kopano) adding support for ical configuration via envvars in, 50-kopano-apply-envvars. --- CHANGELOG.md | 4 ++++ demo/Makefile | 2 +- demo/docker-compose.yml | 7 ++++--- src/kopano/entry.d/50-kopano-apply-envvars | 3 +++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee8f7fd..0979ce6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 1.2.2 + +- [kopano](src/kopano) adding support for ical configuration via envvars in, 50-kopano-apply-envvars. + # 1.2.1 - [docker](Dockerfile) The kopano installation now (version 10.0.6) populate all example-config files in /etc/kopano. This breaks our configuration, so we need to remove them. They can still be found here /usr/share/doc/kopano/example-config. diff --git a/demo/Makefile b/demo/Makefile index 55239c7..4db8f6f 100644 --- a/demo/Makefile +++ b/demo/Makefile @@ -70,7 +70,7 @@ wait_%: sleep $* web: - firefox localhost:8080 & + firefox localhost:8008 & auth-show_conf: docker-compose exec auth ldap search -b cn=config olcDatabase={1}mdb diff --git a/demo/docker-compose.yml b/demo/docker-compose.yml index b295375..6aed495 100644 --- a/demo/docker-compose.yml +++ b/demo/docker-compose.yml @@ -6,7 +6,8 @@ services: networks: - backend ports: - - "127.0.0.1:8080:80" + - "127.0.0.1:8008:80" # HTTP alternative + - "127.0.0.1:8080:8080" # ICAL depends_on: - auth - db @@ -27,7 +28,7 @@ services: - app-conf:/etc/kopano - app-atch:/var/lib/kopano/attachments - app-sync:/var/lib/z-push - - app-spam:/var/lib/kopano/spamd # kopano-spamd integration + - app-spam:/var/lib/kopano/spamd # kopano-spamd integration - /etc/localtime:/etc/localtime:ro # Use host timezone cap_add: # helps debugging by alowing strace - sys_ptrace @@ -38,7 +39,7 @@ services: networks: - backend ports: - - "127.0.0.1:25:25" + - "127.0.0.1:25:25" # SMTP depends_on: - auth environment: diff --git a/src/kopano/entry.d/50-kopano-apply-envvars b/src/kopano/entry.d/50-kopano-apply-envvars index ffd9241..36e0aa2 100755 --- a/src/kopano/entry.d/50-kopano-apply-envvars +++ b/src/kopano/entry.d/50-kopano-apply-envvars @@ -18,6 +18,7 @@ ldap_cfg_file=$DOCKER_CONF_DIR1/ldap.cfg spooler_cfg_file=$DOCKER_CONF_DIR1/spooler.cfg dagent_cfg_file=$DOCKER_CONF_DIR1/dagent.cfg spamd_cfg_file=$DOCKER_CONF_DIR1/spamd.cfg +ical_cfg_file=$DOCKER_CONF_DIR1/ical.cfg zpush_cfg_file=$DOCKER_CONF_DIR2/config.php sqlstate_cfg_file=$DOCKER_CONF_DIR2/backend/sqlstatemachine/config.php @@ -31,6 +32,7 @@ ldap_env_vars="LDAP_URI LDAP_HOST LDAP_PORT LDAP_PROTOCOL LDAP_SEARCH_BASE LDAP_ spooler_env_vars="SMTP_SERVER SMTP_PORT LOG_LEVEL" dagent_env_vars="LMTP_LISTEN LOG_LEVEL" spamd_env_vars="LOG_METHOD SPAM_DIR SPAM_DB HEADER_TAG LEARN_HAM HAM_DIR SA_GROUP" +ical_env_vars="ICAL_LISTEN ICALS_LISTEN ENABLE_ICAL_GET" zpush_env_vars="TIMEZONE USE_CUSTOM_REMOTE_IP_HEADER USE_FULLEMAIL_FOR_LOGIN STATE_MACHINE STATE_DIR LOGBACKEND LOGLEVEL LOGAUTHFAIL LOG_SYSLOG_PROGRAM LOG_SYSLOG_FACILITY SYNC_CONFLICT_DEFAULT PING_INTERVAL FILEAS_ORDER SYNC_MAX_ITEMS UNSET_UNDEFINED_PROPERTIES ALLOW_WEBSERVICE_USERS_ACCESS USE_PARTIAL_FOLDERSYNC" sqlstate_env_vars="STATE_SQL_ENGINE STATE_SQL_SERVER STATE_SQL_PORT STATE_SQL_DATABASE STATE_SQL_USER STATE_SQL_PASSWORD STATE_SQL_OPTIONS" @@ -74,6 +76,7 @@ kopano_apply_envvars() { _kopano_apply_envvars_gen $spooler_cfg_file $spooler_env_vars _kopano_apply_envvars_gen $dagent_cfg_file $dagent_env_vars _kopano_apply_envvars_gen $spamd_cfg_file $spamd_env_vars + _kopano_apply_envvars_gen $ical_cfg_file $ical_env_vars } kopano_apply_phpenvvars() {