ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5519 from tsiegleauq/fix-jitsi-password-doc

Browse Source 
Change jitsi_password to jitsi_room_password
This commit is contained in:
Emanuel Schütze 2020-09-04 15:10:09 +02:00 committed by GitHub
commit fb27f8ce8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/.env
View File

@ -63,7 +63,7 @@ EMAIL_HOST_PASSWORD=
EMAIL_HOST_USER= EMAIL_HOST_USER=
EMAIL_PORT= EMAIL_PORT=
JITSI_DOMAIN= JITSI_DOMAIN=
JITSI_PASSWORD= JITSI_ROOM_PASSWORD=
JITSI_ROOM_NAME= JITSI_ROOM_NAME=
REDIS_CHANNLES_HOST= REDIS_CHANNLES_HOST=
REDIS_CHANNLES_PORT= REDIS_CHANNLES_PORT=

2
docker/docker-compose.yml.m4
View File

@ -60,7 +60,7 @@ x-osserver-env: &default-osserver-env
ENABLE_SAML: "ifenvelse(`ENABLE_SAML', False)" ENABLE_SAML: "ifenvelse(`ENABLE_SAML', False)"
INSTANCE_DOMAIN: "ifenvelse(`INSTANCE_DOMAIN', http://example.com:8000)" INSTANCE_DOMAIN: "ifenvelse(`INSTANCE_DOMAIN', http://example.com:8000)"
JITSI_DOMAIN: "ifenvelse(`JITSI_DOMAIN', None)" 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)" JITSI_ROOM_NAME: "ifenvelse(`JITSI_ROOM_NAME', None)"
OPENSLIDES_LOG_LEVEL: "ifenvelse(`OPENSLIDES_LOG_LEVEL', INFO)" OPENSLIDES_LOG_LEVEL: "ifenvelse(`OPENSLIDES_LOG_LEVEL', INFO)"
REDIS_CHANNLES_HOST: "ifenvelse(`REDIS_CHANNLES_HOST', redis-channels)" REDIS_CHANNLES_HOST: "ifenvelse(`REDIS_CHANNLES_HOST', redis-channels)"

2
docker/docker-stack.yml.m4
View File

@ -59,7 +59,7 @@ x-osserver-env: &default-osserver-env
ENABLE_SAML: "ifenvelse(`ENABLE_SAML', False)" ENABLE_SAML: "ifenvelse(`ENABLE_SAML', False)"
INSTANCE_DOMAIN: "ifenvelse(`INSTANCE_DOMAIN', http://example.com:8000)" INSTANCE_DOMAIN: "ifenvelse(`INSTANCE_DOMAIN', http://example.com:8000)"
JITSI_DOMAIN: "ifenvelse(`JITSI_DOMAIN', None)" 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)" JITSI_ROOM_NAME: "ifenvelse(`JITSI_ROOM_NAME', None)"
OPENSLIDES_LOG_LEVEL: "ifenvelse(`OPENSLIDES_LOG_LEVEL', INFO)" OPENSLIDES_LOG_LEVEL: "ifenvelse(`OPENSLIDES_LOG_LEVEL', INFO)"
REDIS_CHANNLES_HOST: "ifenvelse(`REDIS_CHANNLES_HOST', redis-channels)" REDIS_CHANNLES_HOST: "ifenvelse(`REDIS_CHANNLES_HOST', redis-channels)"

2
server/docker/settings.py
View File

@ -135,7 +135,7 @@ ENABLE_ELECTRONIC_VOTING = get_env("ENABLE_ELECTRONIC_VOTING", False, bool)
# Jitsi integration # Jitsi integration
JITSI_DOMAIN = get_env("JITSI_DOMAIN", None) JITSI_DOMAIN = get_env("JITSI_DOMAIN", None)
JITSI_ROOM_NAME = get_env("JITSI_ROOM_NAME", 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" TIME_ZONE = "Europe/Berlin"
STATICFILES_DIRS = [os.path.join(OPENSLIDES_USER_DATA_DIR, "static")] + STATICFILES_DIRS STATICFILES_DIRS = [os.path.join(OPENSLIDES_USER_DATA_DIR, "static")] + STATICFILES_DIRS

2
server/openslides/utils/settings.py.tpl
View File

@ -136,7 +136,7 @@ ENABLE_ELECTRONIC_VOTING = False
# Jitsi integration # Jitsi integration
# JITSI_DOMAIN = None # JITSI_DOMAIN = None
# JITSI_ROOM_NAME = None # JITSI_ROOM_NAME = None
# JITSI_PASSWORD = None # JITSI_ROOM_PASSWORD = None
# Internationalization # Internationalization