From 681dd1a8640ad328365b01145b28ba55f1640ccb Mon Sep 17 00:00:00 2001
From: Jonas 12t <jturbeaux@pm.me>
Date: Tue, 1 Jun 2021 13:45:58 +0400
Subject: [PATCH] email

---
 docker-compose.yml | 35 +++++++++++++++++++----------------
 env_example        | 28 ++++++----------------------
 2 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 604f122..23a966f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,6 +2,25 @@ version: "3.8"
 
 services:
 
+  postgres:
+    image: postgres:13-alpine
+    networks:
+      - frontend
+    env_file:
+      - .env
+    volumes:
+      - ./docker-volume/db:/var/lib/postgresql/data
+    restart: "always"
+
+  redis:
+    networks:
+      - frontend
+    image: redis:6-alpine
+    volumes:
+      - ./docker-volume/redis:/data
+    restart: "always"
+
+    
   peertube:
     image: chocobozzz/peertube:production-buster
     networks:
@@ -34,23 +53,7 @@ services:
       - "traefik.http.services.peertube.loadbalancer.server.port=9000"
 
 
-  postgres:
-    image: postgres:13-alpine
-    networks:
-      - frontend
-    env_file:
-      - .env
-    volumes:
-      - ./docker-volume/db:/var/lib/postgresql/data
-    restart: "always"
 
-  redis:
-    networks:
-      - frontend
-    image: redis:6-alpine
-    volumes:
-      - ./docker-volume/redis:/data
-    restart: "always"
 
 
 networks:
diff --git a/env_example b/env_example
index c19bcb4..3f70c4b 100644
--- a/env_example
+++ b/env_example
@@ -27,27 +27,11 @@ PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "172.18.0.0/16", "172.36.0.0/16"]
 
 # E-mail configuration
 # If you use a Custom SMTP server
-#PEERTUBE_SMTP_USERNAME=
-#PEERTUBE_SMTP_PASSWORD=
-
-# Default to Postfix service name "postfix" in docker-compose.yml
-# May be the hostname of your Custom SMTP server
-PEERTUBE_SMTP_HOSTNAME=postfix
-PEERTUBE_SMTP_PORT=25
-PEERTUBE_SMTP_FROM=noreply@<MY DOMAIN>
+PEERTUBE_SMTP_USERNAME=user@example.com
+PEERTUBE_SMTP_PASSWORD=example_password
+PEERTUBE_SMTP_HOSTNAME=smtp.example.com
+PEERTUBE_SMTP_PORT=587
+PEERTUBE_SMTP_FROM=user@example.com
 PEERTUBE_SMTP_TLS=false
 PEERTUBE_SMTP_DISABLE_STARTTLS=false
-PEERTUBE_ADMIN_EMAIL=<MY EMAIL ADDRESS>
-
-# Postfix service configuration
-POSTFIX_myhostname=<MY DOMAIN>
-# If you need to generate a list of sub/DOMAIN keys
-# pass them as a whitespace separated string <DOMAIN>=<selector>
-OPENDKIM_DOMAINS=<MY DOMAIN>=peertube
-# see https://github.com/wader/postfix-relay/pull/18
-OPENDKIM_RequireSafeKeys=no
-
-# /!\ Prefer to use the PeerTube admin interface to set the following configurations /!\
-#PEERTUBE_SIGNUP_ENABLED=true
-#PEERTUBE_TRANSCODING_ENABLED=true
-#PEERTUBE_CONTACT_FORM_ENABLED=true
+PEERTUBE_ADMIN_EMAIL=user@example.com
\ No newline at end of file