diff options
| author | Stakovicz <83301974+stakovicz@users.noreply.github.com> | 2021-05-25 11:34:10 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2021-05-25 11:35:29 +0200 |
| commit | 78c5e31049900550ef1cb5a1c7d5b90c3aee3eee (patch) | |
| tree | d6ce73891d4d940df65a5808a67b376e188aa6ca /support/docker | |
| parent | 2c2631e42a9a3ac5bfe4f84fbd5b842b8d969bae (diff) | |
| download | PeerTube-78c5e31049900550ef1cb5a1c7d5b90c3aee3eee.tar.gz PeerTube-78c5e31049900550ef1cb5a1c7d5b90c3aee3eee.tar.zst PeerTube-78c5e31049900550ef1cb5a1c7d5b90c3aee3eee.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>
Diffstat (limited to 'support/docker')
| -rw-r--r-- | support/docker/production/.env | 1 | ||||
| -rw-r--r-- | support/docker/production/config/custom-environment-variables.yaml | 3 |
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 |
| 9 | PEERTUBE_DB_USERNAME=<MY POSTGRES USERNAME> | 9 | PEERTUBE_DB_USERNAME=<MY POSTGRES USERNAME> |
| 10 | PEERTUBE_DB_PASSWORD=<MY POSTGRES PASSWORD> | 10 | PEERTUBE_DB_PASSWORD=<MY POSTGRES PASSWORD> |
| 11 | PEERTUBE_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 |
| 12 | PEERTUBE_DB_HOSTNAME=postgres | 13 | PEERTUBE_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 | ||
| 23 | redis: | 26 | redis: |
| 24 | hostname: "PEERTUBE_REDIS_HOSTNAME" | 27 | hostname: "PEERTUBE_REDIS_HOSTNAME" |