aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-05-30 08:39:44 +0200
committerChocobozzz <me@florianbigard.com>2018-05-30 08:39:44 +0200
commit18eb286e0bc7ebd793d7eeb475d815b3a588404f (patch)
tree4bca1abcf5c67669e23c7643c6e4a5152332c11e
parent51df0cf3d7b0579c30cf9decf0b39f3f9ee38844 (diff)
downloadPeerTube-18eb286e0bc7ebd793d7eeb475d815b3a588404f.tar.gz
PeerTube-18eb286e0bc7ebd793d7eeb475d815b3a588404f.tar.zst
PeerTube-18eb286e0bc7ebd793d7eeb475d815b3a588404f.zip
Cleanup docker configuration
-rw-r--r--support/docker/production/config/production.yaml2
-rw-r--r--support/docker/production/docker-compose.yml7
2 files changed, 4 insertions, 5 deletions
diff --git a/support/docker/production/config/production.yaml b/support/docker/production/config/production.yaml
index 9c8f0c818..64fc9e82c 100644
--- a/support/docker/production/config/production.yaml
+++ b/support/docker/production/config/production.yaml
@@ -45,5 +45,3 @@ log:
45 45
46admin: 46admin:
47 email: null 47 email: null
48
49
diff --git a/support/docker/production/docker-compose.yml b/support/docker/production/docker-compose.yml
index 32ee75113..8144502e7 100644
--- a/support/docker/production/docker-compose.yml
+++ b/support/docker/production/docker-compose.yml
@@ -25,12 +25,9 @@ services:
25 PEERTUBE_WEBSERVER_HOSTNAME: my.domain.tld 25 PEERTUBE_WEBSERVER_HOSTNAME: my.domain.tld
26 PEERTUBE_WEBSERVER_PORT: 443 26 PEERTUBE_WEBSERVER_PORT: 443
27 PEERTUBE_WEBSERVER_HTTPS: "true" 27 PEERTUBE_WEBSERVER_HTTPS: "true"
28 PEERTUBE_ADMIN_EMAIL: admin@domain.tld
29 PEERTUBE_DB_HOSTNAME: postgres 28 PEERTUBE_DB_HOSTNAME: postgres
30 PEERTUBE_DB_USERNAME: postgres_user 29 PEERTUBE_DB_USERNAME: postgres_user
31 PEERTUBE_DB_PASSWORD: postgres_password 30 PEERTUBE_DB_PASSWORD: postgres_password
32 PEERTUBE_SIGNUP_ENABLED: "true"
33 PEERTUBE_TRANSCODING_ENABLED: "true"
34 PEERTUBE_REDIS_HOSTNAME: redis 31 PEERTUBE_REDIS_HOSTNAME: redis
35 PEERTUBE_SMTP_USERNAME: null 32 PEERTUBE_SMTP_USERNAME: null
36 PEERTUBE_SMTP_PASSWORD: null 33 PEERTUBE_SMTP_PASSWORD: null
@@ -38,6 +35,10 @@ services:
38 PEERTUBE_SMTP_PORT: 25 35 PEERTUBE_SMTP_PORT: 25
39 PEERTUBE_SMTP_FROM: noreply@peertube.domain.tld 36 PEERTUBE_SMTP_FROM: noreply@peertube.domain.tld
40 PEERTUBE_SMTP_TLS: "true" 37 PEERTUBE_SMTP_TLS: "true"
38 # /!\ Prefer to use the PeerTube admin interface to set the following configurations /!\
39 # PEERTUBE_ADMIN_EMAIL: admin@domain.tld
40 # PEERTUBE_SIGNUP_ENABLED: "true"
41 # PEERTUBE_TRANSCODING_ENABLED: "true"
41 # Traefik labels are suggested as an example for people using Traefik, 42 # Traefik labels are suggested as an example for people using Traefik,
42 # remove them if you are using another reverse proxy. 43 # remove them if you are using another reverse proxy.
43 labels: 44 labels: