diff options
author | Kim <1877318+kimsible@users.noreply.github.com> | 2020-02-24 15:30:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-24 15:30:14 +0100 |
commit | e962e1c3c52b77075ec7b46ed0984476684551ab (patch) | |
tree | 4c5afdba0862b8668763a7e26f7b2334ba9c323f /support/docker/production | |
parent | f30736c8917e66ed8940dd664d75826dc5a2853b (diff) | |
download | PeerTube-e962e1c3c52b77075ec7b46ed0984476684551ab.tar.gz PeerTube-e962e1c3c52b77075ec7b46ed0984476684551ab.tar.zst PeerTube-e962e1c3c52b77075ec7b46ed0984476684551ab.zip |
Chore/docker-documentation-improvements (#2494)
* unify env_var names to replace
* detail more and improve docker doc
* fix title
* move acme email and domains to traefik command
* add details about TRAEFIK_ACME_* variables
* Fix preview links from /develop to /master
Diffstat (limited to 'support/docker/production')
-rw-r--r-- | support/docker/production/.env | 23 | ||||
-rw-r--r-- | support/docker/production/config/traefik.toml | 11 | ||||
-rw-r--r-- | support/docker/production/docker-compose.yml | 5 |
3 files changed, 18 insertions, 21 deletions
diff --git a/support/docker/production/.env b/support/docker/production/.env index 95ca42d69..0321b04ae 100644 --- a/support/docker/production/.env +++ b/support/docker/production/.env | |||
@@ -1,10 +1,11 @@ | |||
1 | POSTGRES_USER=peertube | 1 | POSTGRES_USER=<MY POSTGRES USERNAME> |
2 | POSTGRES_PASSWORD=peertube | 2 | POSTGRES_PASSWORD=<MY POSTGRES PASSWORD> |
3 | POSTGRES_DB=peertube | 3 | POSTGRES_DB=<MY POSTGRES DB> |
4 | PEERTUBE_DB_USERNAME=$(POSTGRES_USER) | 4 | PEERTUBE_DB_USERNAME=<MY POSTGRES USERNAME> |
5 | PEERTUBE_DB_PASSWORD=$(POSTGRES_PASSWORD) | 5 | PEERTUBE_DB_PASSWORD=<MY POSTGRES PASSWORD> |
6 | # PEERTUBE_DB_HOSTNAME is the Postgres service name in docker-compose.yml | ||
6 | PEERTUBE_DB_HOSTNAME=postgres | 7 | PEERTUBE_DB_HOSTNAME=postgres |
7 | PEERTUBE_WEBSERVER_HOSTNAME=domain.tld | 8 | PEERTUBE_WEBSERVER_HOSTNAME=<MY DOMAIN> |
8 | PEERTUBE_WEBSERVER_PORT=443 | 9 | PEERTUBE_WEBSERVER_PORT=443 |
9 | PEERTUBE_WEBSERVER_HTTPS=true | 10 | PEERTUBE_WEBSERVER_HTTPS=true |
10 | # If you need more than one IP as trust_proxy | 11 | # If you need more than one IP as trust_proxy |
@@ -14,11 +15,15 @@ PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "172.18.0.0/16"] | |||
14 | #PEERTUBE_SMTP_PASSWORD= | 15 | #PEERTUBE_SMTP_PASSWORD= |
15 | PEERTUBE_SMTP_HOSTNAME=postfix | 16 | PEERTUBE_SMTP_HOSTNAME=postfix |
16 | PEERTUBE_SMTP_PORT=25 | 17 | PEERTUBE_SMTP_PORT=25 |
17 | PEERTUBE_SMTP_FROM=noreply@domain.tld | 18 | PEERTUBE_SMTP_FROM=noreply@<MY DOMAIN> |
18 | PEERTUBE_SMTP_TLS=false | 19 | PEERTUBE_SMTP_TLS=false |
19 | PEERTUBE_SMTP_DISABLE_STARTTLS=false | 20 | PEERTUBE_SMTP_DISABLE_STARTTLS=false |
20 | PEERTUBE_ADMIN_EMAIL=admin@domain.tld | 21 | PEERTUBE_ADMIN_EMAIL=<MY EMAIL ADDRESS> |
21 | POSTFIX_myhostname=${PEERTUBE_WEBSERVER_HOSTNAME} | 22 | POSTFIX_myhostname=<MY DOMAIN> |
23 | TRAEFIK_ACME_EMAIL=<MY EMAIL ADDRESS> | ||
24 | # If you need to obtain ACME certificates for more than one DOMAIN | ||
25 | # pass them as a comma separated string | ||
26 | TRAEFIK_ACME_DOMAINS=<MY DOMAIN> | ||
22 | # /!\ Prefer to use the PeerTube admin interface to set the following configurations /!\ | 27 | # /!\ Prefer to use the PeerTube admin interface to set the following configurations /!\ |
23 | #PEERTUBE_SIGNUP_ENABLED=true | 28 | #PEERTUBE_SIGNUP_ENABLED=true |
24 | #PEERTUBE_TRANSCODING_ENABLED=true | 29 | #PEERTUBE_TRANSCODING_ENABLED=true |
diff --git a/support/docker/production/config/traefik.toml b/support/docker/production/config/traefik.toml index 6abced3db..1d7d207fd 100644 --- a/support/docker/production/config/traefik.toml +++ b/support/docker/production/config/traefik.toml | |||
@@ -37,12 +37,6 @@ defaultEntryPoints = ["http", "https"] | |||
37 | # Enable ACME (Let's Encrypt): automatic SSL. | 37 | # Enable ACME (Let's Encrypt): automatic SSL. |
38 | [acme] | 38 | [acme] |
39 | 39 | ||
40 | # Email address used for registration. | ||
41 | # | ||
42 | # Required | ||
43 | # | ||
44 | email = "<MY EMAIL ADDRESS>" | ||
45 | |||
46 | # File or key used for certificates storage. | 40 | # File or key used for certificates storage. |
47 | # | 41 | # |
48 | # Required | 42 | # Required |
@@ -57,11 +51,6 @@ storage = "/etc/acme.json" | |||
57 | # | 51 | # |
58 | entryPoint = "https" | 52 | entryPoint = "https" |
59 | 53 | ||
60 | # Domains list. | ||
61 | # | ||
62 | [[acme.domains]] | ||
63 | main = "<MY DOMAIN>" | ||
64 | |||
65 | # Use a HTTP-01 acme challenge rather than TLS-SNI-01 challenge | 54 | # Use a HTTP-01 acme challenge rather than TLS-SNI-01 challenge |
66 | # | 55 | # |
67 | # Optional but recommend | 56 | # Optional but recommend |
diff --git a/support/docker/production/docker-compose.yml b/support/docker/production/docker-compose.yml index b81a8745b..72b08b855 100644 --- a/support/docker/production/docker-compose.yml +++ b/support/docker/production/docker-compose.yml | |||
@@ -5,7 +5,10 @@ services: | |||
5 | reverse-proxy: | 5 | reverse-proxy: |
6 | image: traefik:v1.7 | 6 | image: traefik:v1.7 |
7 | network_mode: "host" | 7 | network_mode: "host" |
8 | command: --docker # Tells Træfik to listen to docker | 8 | command: |
9 | - "--docker" # Tells Træfik to listen to docker | ||
10 | - "--acme.email=${TRAEFIK_ACME_EMAIL}" # Let's Encrypt ACME email | ||
11 | - "--acme.domains=${TRAEFIK_ACME_DOMAINS}" # Let's Encrypt ACME domain list | ||
9 | ports: | 12 | ports: |
10 | - "80:80" # The HTTP port | 13 | - "80:80" # The HTTP port |
11 | - "443:443" # The HTTPS port | 14 | - "443:443" # The HTTPS port |