From ed9e50a1b4b8a2870c8c437fc0547404a05df7f0 Mon Sep 17 00:00:00 2001 From: Gernot Schulz Date: Thu, 10 Sep 2020 09:11:40 +0200 Subject: [PATCH] Docker templates: Set empty values instead of None --- docker/docker-compose.yml.m4 | 6 +++--- docker/docker-stack.yml.m4 | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/docker-compose.yml.m4 b/docker/docker-compose.yml.m4 index da6660833..8cbc3c7dd 100644 --- a/docker/docker-compose.yml.m4 +++ b/docker/docker-compose.yml.m4 @@ -59,9 +59,9 @@ x-osserver-env: &default-osserver-env ENABLE_ELECTRONIC_VOTING: "ifenvelse(`ENABLE_ELECTRONIC_VOTING', False)" ENABLE_SAML: "ifenvelse(`ENABLE_SAML', False)" INSTANCE_DOMAIN: "ifenvelse(`INSTANCE_DOMAIN', http://example.com:8000)" - JITSI_DOMAIN: "ifenvelse(`JITSI_DOMAIN', None)" - JITSI_ROOM_PASSWORD: "ifenvelse(`JITSI_ROOM_PASSWORD', None)" - JITSI_ROOM_NAME: "ifenvelse(`JITSI_ROOM_NAME', None)" + JITSI_DOMAIN: "ifenvelse(`JITSI_DOMAIN',)" + JITSI_ROOM_PASSWORD: "ifenvelse(`JITSI_ROOM_PASSWORD',)" + JITSI_ROOM_NAME: "ifenvelse(`JITSI_ROOM_NAME',)" OPENSLIDES_LOG_LEVEL: "ifenvelse(`OPENSLIDES_LOG_LEVEL', INFO)" REDIS_CHANNLES_HOST: "ifenvelse(`REDIS_CHANNLES_HOST', redis-channels)" REDIS_CHANNLES_PORT: ifenvelse(`REDIS_CHANNLES_PORT', 6379) diff --git a/docker/docker-stack.yml.m4 b/docker/docker-stack.yml.m4 index 41afd76c0..640843363 100644 --- a/docker/docker-stack.yml.m4 +++ b/docker/docker-stack.yml.m4 @@ -58,9 +58,9 @@ x-osserver-env: &default-osserver-env ENABLE_ELECTRONIC_VOTING: "ifenvelse(`ENABLE_ELECTRONIC_VOTING', False)" ENABLE_SAML: "ifenvelse(`ENABLE_SAML', False)" INSTANCE_DOMAIN: "ifenvelse(`INSTANCE_DOMAIN', http://example.com:8000)" - JITSI_DOMAIN: "ifenvelse(`JITSI_DOMAIN', None)" - JITSI_ROOM_PASSWORD: "ifenvelse(`JITSI_ROOM_PASSWORD', None)" - JITSI_ROOM_NAME: "ifenvelse(`JITSI_ROOM_NAME', None)" + JITSI_DOMAIN: "ifenvelse(`JITSI_DOMAIN',)" + JITSI_ROOM_PASSWORD: "ifenvelse(`JITSI_ROOM_PASSWORD',)" + JITSI_ROOM_NAME: "ifenvelse(`JITSI_ROOM_NAME',)" OPENSLIDES_LOG_LEVEL: "ifenvelse(`OPENSLIDES_LOG_LEVEL', INFO)" REDIS_CHANNLES_HOST: "ifenvelse(`REDIS_CHANNLES_HOST', redis-channels)" REDIS_CHANNLES_PORT: ifenvelse(`REDIS_CHANNLES_PORT', 6379)