aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStakovicz <83301974+stakovicz@users.noreply.github.com>2021-05-25 11:34:10 +0200
committerGitHub <noreply@github.com>2021-05-25 11:34:10 +0200
commitd35c81fa1cb3946d887f223383a1cae58fe32b09 (patch)
treea7df839c625e6a1e1000c152c35f508056b2b2bb
parent7e47e2aa5e13594dedde8abbb03fca914d64953d (diff)
downloadPeerTube-d35c81fa1cb3946d887f223383a1cae58fe32b09.tar.gz
PeerTube-d35c81fa1cb3946d887f223383a1cae58fe32b09.tar.zst
PeerTube-d35c81fa1cb3946d887f223383a1cae58fe32b09.zip
Allow SSL database parameter (#4114)
* Allow SSL database parameter Allow SSL database parameter via environment variable * Allow SSL database parameter Allow SSL database parameter via environment variable * Update support/docker/production/config/custom-environment-variables.yaml Co-authored-by: Chocobozzz <chocobozzz@cpy.re> Co-authored-by: Chocobozzz <chocobozzz@cpy.re>
-rw-r--r--support/docker/production/.env1
-rw-r--r--support/docker/production/config/custom-environment-variables.yaml3
2 files changed, 4 insertions, 0 deletions
diff --git a/support/docker/production/.env b/support/docker/production/.env
index 3e19c3817..70743e0ec 100644
--- a/support/docker/production/.env
+++ b/support/docker/production/.env
@@ -8,6 +8,7 @@ POSTGRES_DB=peertube
8#PEERTUBE_DB_SUFFIX=_prod 8#PEERTUBE_DB_SUFFIX=_prod
9PEERTUBE_DB_USERNAME=<MY POSTGRES USERNAME> 9PEERTUBE_DB_USERNAME=<MY POSTGRES USERNAME>
10PEERTUBE_DB_PASSWORD=<MY POSTGRES PASSWORD> 10PEERTUBE_DB_PASSWORD=<MY POSTGRES PASSWORD>
11PEERTUBE_DB_SSL=false
11# Default to Postgres service name "postgres" in docker-compose.yml 12# Default to Postgres service name "postgres" in docker-compose.yml
12PEERTUBE_DB_HOSTNAME=postgres 13PEERTUBE_DB_HOSTNAME=postgres
13 14
diff --git a/support/docker/production/config/custom-environment-variables.yaml b/support/docker/production/config/custom-environment-variables.yaml
index 8226715e0..0ed060bbf 100644
--- a/support/docker/production/config/custom-environment-variables.yaml
+++ b/support/docker/production/config/custom-environment-variables.yaml
@@ -19,6 +19,9 @@ database:
19 suffix: "PEERTUBE_DB_SUFFIX" 19 suffix: "PEERTUBE_DB_SUFFIX"
20 username: "PEERTUBE_DB_USERNAME" 20 username: "PEERTUBE_DB_USERNAME"
21 password: "PEERTUBE_DB_PASSWORD" 21 password: "PEERTUBE_DB_PASSWORD"
22 ssl:
23 __name: "PEERTUBE_DB_SSL"
24 __format: "json"
22 25
23redis: 26redis:
24 hostname: "PEERTUBE_REDIS_HOSTNAME" 27 hostname: "PEERTUBE_REDIS_HOSTNAME"