From 0933bb6abd6d570a84d721320ff761e0b1a1d979 Mon Sep 17 00:00:00 2001
From: Sean <sean.f.t.engelhardt@gmail.com>
Date: Fri, 21 Aug 2020 15:46:43 +0200
Subject: [PATCH] Change jitsi_password to jitsi_room_password

Fixes false naming in both documentation, template
and docker
---
 docker/.env                             | 2 +-
 docker/docker-compose.yml.m4            | 2 +-
 docker/docker-stack.yml.m4              | 2 +-
 server/docker/settings.py               | 2 +-
 server/openslides/utils/settings.py.tpl | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker/.env b/docker/.env
index 876e249e3..d9fee5b9f 100644
--- a/docker/.env
+++ b/docker/.env
@@ -63,7 +63,7 @@ EMAIL_HOST_PASSWORD=
 EMAIL_HOST_USER=
 EMAIL_PORT=
 JITSI_DOMAIN=
-JITSI_PASSWORD=
+JITSI_ROOM_PASSWORD=
 JITSI_ROOM_NAME=
 REDIS_CHANNLES_HOST=
 REDIS_CHANNLES_PORT=
diff --git a/docker/docker-compose.yml.m4 b/docker/docker-compose.yml.m4
index 69637ab42..da6660833 100644
--- a/docker/docker-compose.yml.m4
+++ b/docker/docker-compose.yml.m4
@@ -60,7 +60,7 @@ x-osserver-env: &default-osserver-env
     ENABLE_SAML: "ifenvelse(`ENABLE_SAML', False)"
     INSTANCE_DOMAIN: "ifenvelse(`INSTANCE_DOMAIN', http://example.com:8000)"
     JITSI_DOMAIN: "ifenvelse(`JITSI_DOMAIN', None)"
-    JITSI_PASSWORD: "ifenvelse(`JITSI_PASSWORD', None)"
+    JITSI_ROOM_PASSWORD: "ifenvelse(`JITSI_ROOM_PASSWORD', None)"
     JITSI_ROOM_NAME: "ifenvelse(`JITSI_ROOM_NAME', None)"
     OPENSLIDES_LOG_LEVEL: "ifenvelse(`OPENSLIDES_LOG_LEVEL', INFO)"
     REDIS_CHANNLES_HOST: "ifenvelse(`REDIS_CHANNLES_HOST', redis-channels)"
diff --git a/docker/docker-stack.yml.m4 b/docker/docker-stack.yml.m4
index acfb3a6d4..41afd76c0 100644
--- a/docker/docker-stack.yml.m4
+++ b/docker/docker-stack.yml.m4
@@ -59,7 +59,7 @@ x-osserver-env: &default-osserver-env
     ENABLE_SAML: "ifenvelse(`ENABLE_SAML', False)"
     INSTANCE_DOMAIN: "ifenvelse(`INSTANCE_DOMAIN', http://example.com:8000)"
     JITSI_DOMAIN: "ifenvelse(`JITSI_DOMAIN', None)"
-    JITSI_PASSWORD: "ifenvelse(`JITSI_PASSWORD', None)"
+    JITSI_ROOM_PASSWORD: "ifenvelse(`JITSI_ROOM_PASSWORD', None)"
     JITSI_ROOM_NAME: "ifenvelse(`JITSI_ROOM_NAME', None)"
     OPENSLIDES_LOG_LEVEL: "ifenvelse(`OPENSLIDES_LOG_LEVEL', INFO)"
     REDIS_CHANNLES_HOST: "ifenvelse(`REDIS_CHANNLES_HOST', redis-channels)"
diff --git a/server/docker/settings.py b/server/docker/settings.py
index ddffedb97..e5fb0537a 100644
--- a/server/docker/settings.py
+++ b/server/docker/settings.py
@@ -135,7 +135,7 @@ ENABLE_ELECTRONIC_VOTING = get_env("ENABLE_ELECTRONIC_VOTING", False, bool)
 # Jitsi integration
 JITSI_DOMAIN = get_env("JITSI_DOMAIN", None)
 JITSI_ROOM_NAME = get_env("JITSI_ROOM_NAME", None)
-JITSI_PASSWORD = get_env("JITSI_PASSWORD", None)
+JITSI_ROOM_PASSWORD = get_env("JITSI_ROOM_PASSWORD", None)
 
 TIME_ZONE = "Europe/Berlin"
 STATICFILES_DIRS = [os.path.join(OPENSLIDES_USER_DATA_DIR, "static")] + STATICFILES_DIRS
diff --git a/server/openslides/utils/settings.py.tpl b/server/openslides/utils/settings.py.tpl
index 70cca40e0..30eedeebb 100644
--- a/server/openslides/utils/settings.py.tpl
+++ b/server/openslides/utils/settings.py.tpl
@@ -136,7 +136,7 @@ ENABLE_ELECTRONIC_VOTING = False
 # Jitsi integration
 # JITSI_DOMAIN = None
 # JITSI_ROOM_NAME = None
-# JITSI_PASSWORD = None
+# JITSI_ROOM_PASSWORD = None
 
 
 # Internationalization