aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJoël Galeran <Jolg42@users.noreply.github.com>2023-04-07 10:52:49 +0200
committerGitHub <noreply@github.com>2023-04-07 10:52:49 +0200
commit3458e8ba0d3543233444137589e7f79e4be44763 (patch)
treeaed46f4f681e959c70ee355bfc5e256c1ce4260d
parentb302c80dc0d9ba8eabef9ef6576efe36afc57584 (diff)
downloadPeerTube-3458e8ba0d3543233444137589e7f79e4be44763.tar.gz
PeerTube-3458e8ba0d3543233444137589e7f79e4be44763.tar.zst
PeerTube-3458e8ba0d3543233444137589e7f79e4be44763.zip
feat(docker): make database name configurable (#5734)
* feat(docker): make database name configurable WIP Related https://github.com/Chocobozzz/PeerTube/issues/5708 * Update .env * PEERTUBE_DB_NAME & add comments
-rw-r--r--support/docker/production/.env9
-rw-r--r--support/docker/production/config/custom-environment-variables.yaml6
2 files changed, 11 insertions, 4 deletions
diff --git a/support/docker/production/.env b/support/docker/production/.env
index b4e356a58..5b3b366f5 100644
--- a/support/docker/production/.env
+++ b/support/docker/production/.env
@@ -3,11 +3,12 @@ POSTGRES_USER=<MY POSTGRES USERNAME>
3POSTGRES_PASSWORD=<MY POSTGRES PASSWORD> 3POSTGRES_PASSWORD=<MY POSTGRES PASSWORD>
4# Postgres database name "peertube" 4# Postgres database name "peertube"
5POSTGRES_DB=peertube 5POSTGRES_DB=peertube
6# Editable only with a suffix : 6# The database name used by PeerTube will be PEERTUBE_DB_NAME (only if set) *OR* 'peertube'+PEERTUBE_DB_SUFFIX
7#POSTGRES_DB=peertube_prod 7#PEERTUBE_DB_NAME=<MY POSTGRES DB NAME>
8#PEERTUBE_DB_SUFFIX=_prod 8#PEERTUBE_DB_SUFFIX=_prod
9PEERTUBE_DB_USERNAME=<MY POSTGRES USERNAME> 9# Database username and password used by PeerTube must match Postgres', so they are copied:
10PEERTUBE_DB_PASSWORD=<MY POSTGRES PASSWORD> 10PEERTUBE_DB_USERNAME=$POSTGRES_USER
11PEERTUBE_DB_PASSWORD=$POSTGRES_PASSWORD
11PEERTUBE_DB_SSL=false 12PEERTUBE_DB_SSL=false
12# Default to Postgres service name "postgres" in docker-compose.yml 13# Default to Postgres service name "postgres" in docker-compose.yml
13PEERTUBE_DB_HOSTNAME=postgres 14PEERTUBE_DB_HOSTNAME=postgres
diff --git a/support/docker/production/config/custom-environment-variables.yaml b/support/docker/production/config/custom-environment-variables.yaml
index 10432e6a0..8fff54229 100644
--- a/support/docker/production/config/custom-environment-variables.yaml
+++ b/support/docker/production/config/custom-environment-variables.yaml
@@ -1,3 +1,8 @@
1#
2# This file will be read by node-config
3# See https://github.com/node-config/node-config/wiki/Environment-Variables#custom-environment-variables
4#
5
1webserver: 6webserver:
2 hostname: "PEERTUBE_WEBSERVER_HOSTNAME" 7 hostname: "PEERTUBE_WEBSERVER_HOSTNAME"
3 port: 8 port:
@@ -19,6 +24,7 @@ database:
19 port: 24 port:
20 __name: "PEERTUBE_DB_PORT" 25 __name: "PEERTUBE_DB_PORT"
21 __format: "json" 26 __format: "json"
27 name: "PEERTUBE_DB_NAME"
22 suffix: "PEERTUBE_DB_SUFFIX" 28 suffix: "PEERTUBE_DB_SUFFIX"
23 username: "PEERTUBE_DB_USERNAME" 29 username: "PEERTUBE_DB_USERNAME"
24 password: "PEERTUBE_DB_PASSWORD" 30 password: "PEERTUBE_DB_PASSWORD"