diff options
author | kimsible <kimsible@users.noreply.github.com> | 2020-03-10 15:14:19 +0100 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2020-03-11 15:02:13 +0100 |
commit | cd7ec86f5c621f3ad01753e81fc67358db6e7df6 (patch) | |
tree | 830fad79afd3774d6b11407c9987dc37433b1525 | |
parent | 310e95d857838a139dcaf683948ae772b040d078 (diff) | |
download | PeerTube-cd7ec86f5c621f3ad01753e81fc67358db6e7df6.tar.gz PeerTube-cd7ec86f5c621f3ad01753e81fc67358db6e7df6.tar.zst PeerTube-cd7ec86f5c621f3ad01753e81fc67358db6e7df6.zip |
feat: add dkim to docker-compose
-rw-r--r-- | support/doc/docker.md | 11 | ||||
-rw-r--r-- | support/docker/production/.env | 3 | ||||
-rw-r--r-- | support/docker/production/docker-compose.yml | 2 |
3 files changed, 16 insertions, 0 deletions
diff --git a/support/doc/docker.md b/support/doc/docker.md index 2ee922b87..99aa688a9 100644 --- a/support/doc/docker.md +++ b/support/doc/docker.md | |||
@@ -114,6 +114,17 @@ peertube_1 | [example.com:443] 2019-11-16 04:26:06.082 info: Username: root | |||
114 | peertube_1 | [example.com:443] 2019-11-16 04:26:06.083 info: User password: abcdefghijklmnop | 114 | peertube_1 | [example.com:443] 2019-11-16 04:26:06.083 info: User password: abcdefghijklmnop |
115 | ``` | 115 | ``` |
116 | 116 | ||
117 | ### Obtaining Your Automatically Generated DKIM DNS TXT Record | ||
118 | [DKIM](https://en.wikipedia.org/wiki/DomainKeys_Identified_Mail) signature sending and RSA keys generation are enabled by the default Postfix image `mwader/postfix-relay` with [OpenDKIM](http://www.opendkim.org/). | ||
119 | Run `cat ./docker-volume/opendkim/keys/*/*.txt` to display your DKIM DNS TXT Record containing the public key to configure to your domain : | ||
120 | ```BASH | ||
121 | user@s:~/peertube|master⚡ ⇒ cat ./docker-volume/opendkim/keys/*/*.txt | ||
122 | |||
123 | peertube._domainkey.mydomain.tld. IN TXT ( "v=DKIM1; h=sha256; k=rsa; " | ||
124 | "p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0Dx7wLGPFVaxVQ4TGym/eF89aQ8oMxS9v5BCc26Hij91t2Ci8Fl12DHNVqZoIPGm+9tTIoDVDFEFrlPhMOZl8i4jU9pcFjjaIISaV2+qTa8uV1j3MyByogG8pu4o5Ill7zaySYFsYB++cHJ9pjbFSC42dddCYMfuVgrBsLNrvEi3dLDMjJF5l92Uu8YeswFe26PuHX3Avr261n" | ||
125 | "j5joTnYwat4387VEUyGUnZ0aZxCERi+ndXv2/wMJ0tizq+a9+EgqIb+7lkUc2XciQPNuTujM25GhrQBEKznvHyPA6fHsFheymOuB763QpkmnQQLCxyLygAY9mE/5RY+5Q6J9oDOQIDAQAB" ) ; ----- DKIM key peertube for mydomain.tld | ||
126 | ``` | ||
127 | |||
117 | ### What now? | 128 | ### What now? |
118 | 129 | ||
119 | See the production guide ["What now" section](/support/doc/production.md#what-now). | 130 | See the production guide ["What now" section](/support/doc/production.md#what-now). |
diff --git a/support/docker/production/.env b/support/docker/production/.env index 0321b04ae..4743b68db 100644 --- a/support/docker/production/.env +++ b/support/docker/production/.env | |||
@@ -20,6 +20,9 @@ PEERTUBE_SMTP_TLS=false | |||
20 | PEERTUBE_SMTP_DISABLE_STARTTLS=false | 20 | PEERTUBE_SMTP_DISABLE_STARTTLS=false |
21 | PEERTUBE_ADMIN_EMAIL=<MY EMAIL ADDRESS> | 21 | PEERTUBE_ADMIN_EMAIL=<MY EMAIL ADDRESS> |
22 | POSTFIX_myhostname=<MY DOMAIN> | 22 | POSTFIX_myhostname=<MY DOMAIN> |
23 | # If you need to generate a list of sub/DOMAIN keys | ||
24 | # pass them as a whitespace separated string <DOMAIN>=<selector> | ||
25 | OPENDKIM_DOMAINS=<MY DOMAIN>=peertube | ||
23 | TRAEFIK_ACME_EMAIL=<MY EMAIL ADDRESS> | 26 | TRAEFIK_ACME_EMAIL=<MY EMAIL ADDRESS> |
24 | # If you need to obtain ACME certificates for more than one DOMAIN | 27 | # If you need to obtain ACME certificates for more than one DOMAIN |
25 | # pass them as a comma separated string | 28 | # pass them as a comma separated string |
diff --git a/support/docker/production/docker-compose.yml b/support/docker/production/docker-compose.yml index 72b08b855..e937c8b9c 100644 --- a/support/docker/production/docker-compose.yml +++ b/support/docker/production/docker-compose.yml | |||
@@ -70,6 +70,8 @@ services: | |||
70 | image: mwader/postfix-relay | 70 | image: mwader/postfix-relay |
71 | env_file: | 71 | env_file: |
72 | - .env | 72 | - .env |
73 | volumes: | ||
74 | - ./docker-volume/opendkim/keys:/etc/opendkim/keys | ||
73 | labels: | 75 | labels: |
74 | traefik.enable: "false" | 76 | traefik.enable: "false" |
75 | restart: "always" | 77 | restart: "always" |