diff --git a/docker-compose.yml b/docker-compose.yml index 2e50e2b..2bea9ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -432,6 +432,8 @@ services: environment: - KCCONF_MEET_disableFullGAB=false - KCCONF_MEET_guests_enabled=true + - KCCONF_MEET_oidc_useImplicitFlow=true # workaround for guest login with meet https://stash.kopano.io/projects/KWM/repos/meet/pull-requests/102/overview + - KCCONF_MEET_minimumVersion=20200121 # can be used force updates of Meet - SERVICE_TO_START=meet env_file: - kopano_meet.env diff --git a/examples/meet/docker-compose.yml b/examples/meet/docker-compose.yml index 90fbca9..5c22eb3 100644 --- a/examples/meet/docker-compose.yml +++ b/examples/meet/docker-compose.yml @@ -74,7 +74,6 @@ services: - /var/lib/dbus/machine-id:/var/lib/dbus/machine-id - kopanosocket/:/run/kopano environment: - - ADDITIONAL_KOPANO_PACKAGES=python3-grapi.backend.ldap - GRAPI_BACKEND=ldap - LDAP_BASEDN=${LDAP_SEARCH_BASE} - LDAP_BINDDN=${LDAP_BIND_DN} diff --git a/meet/start-service.sh b/meet/start-service.sh index 83d2d45..e9be8e9 100755 --- a/meet/start-service.sh +++ b/meet/start-service.sh @@ -33,7 +33,7 @@ for setting in $(compgen -A variable KCCONF_MEET); do setting2=${setting#KCCONF_MEET_} # dots in setting2 need to be escaped to not be handled as separate entities in the json file case ${!setting} in - true|TRUE|false|FALSE) + true|TRUE|false|FALSE|[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]) jq ".\"${setting2//_/\".\"}\" = ${!setting}" $CONFIG_JSON | sponge $CONFIG_JSON ;; *)