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

Merge pull request #6157 from gsiv/dev/db-table-config

Browse Source 
Make database table configurable through .env
This commit is contained in:
Gernot Schulz 2021-07-15 10:38:26 +02:00 committed by GitHub
commit 7dc35dce40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/.env
View File

@ -103,6 +103,7 @@ DATABASE_HOST=
DATABASE_PASSWORD=
DATABASE_PORT=
DATABASE_USER=
DATABASE_NAME=
MEDIAFILE_DATABASE_NAME=
MEDIAFILE_DATABASE_USER=
MEDIAFILE_DATABASE_PASSWORD=

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

@ -72,6 +72,7 @@ x-osserver-env: &default-osserver-env
DATABASE_PASSWORD: "ifenvelse(`DATABASE_PASSWORD', openslides)"
DATABASE_PORT: ifenvelse(`DATABASE_PORT', 5432)
DATABASE_USER: "ifenvelse(`DATABASE_USER', openslides)"
DATABASE_NAME: "ifenvelse(`DATABASE_NAME', openslides)"
MEDIAFILE_DATABASE_NAME: "read_env(`MEDIAFILE_DATABASE_NAME')"
MEDIAFILE_DATABASE_USER: "read_env(`MEDIAFILE_DATABASE_USER')"
MEDIAFILE_DATABASE_PASSWORD: "read_env(`MEDIAFILE_DATABASE_PASSWORD')"

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

@ -71,6 +71,7 @@ x-osserver-env: &default-osserver-env
DATABASE_PASSWORD: "ifenvelse(`DATABASE_PASSWORD', openslides)"
DATABASE_PORT: ifenvelse(`DATABASE_PORT', 5432)
DATABASE_USER: "ifenvelse(`DATABASE_USER', openslides)"
DATABASE_NAME: "ifenvelse(`DATABASE_NAME', openslides)"
MEDIAFILE_DATABASE_NAME: "read_env(`MEDIAFILE_DATABASE_NAME')"
MEDIAFILE_DATABASE_USER: "read_env(`MEDIAFILE_DATABASE_USER')"
MEDIAFILE_DATABASE_PASSWORD: "read_env(`MEDIAFILE_DATABASE_PASSWORD')"