From 7e8e3550b96c58818c8e62ba55bc97410dc4a8d0 Mon Sep 17 00:00:00 2001
From: 3wc <3wc.git@doesthisthing.work>
Date: Thu, 29 Oct 2020 19:43:39 +0200
Subject: [PATCH] =?UTF-8?q?We=20don't=20need=20a=20separate=20compose.mail?=
 =?UTF-8?q?relay=20=F0=9F=A5=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 compose.mailrelay.yml | 15 ---------------
 compose.yml           |  4 ++++
 2 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 compose.mailrelay.yml

diff --git a/compose.mailrelay.yml b/compose.mailrelay.yml
deleted file mode 100644
index c49968d..0000000
--- a/compose.mailrelay.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-version: "3.8"
- 
-services:
-  app:
-    environment:
-      - SMTP_HOST
-      - MAIL_FROM_ADDRESS
-      - MAIL_DOMAIN
-      - SMTP_AUTHTYPE=PLAIN
-    networks:
-      - mail
-
-networks:
-  mail:
-    external: true
diff --git a/compose.yml b/compose.yml
index 6be1e8e..4e50c90 100644
--- a/compose.yml
+++ b/compose.yml
@@ -20,6 +20,10 @@ services:
       - NEXTCLOUD_TRUSTED_DOMAINS=${DOMAIN}
       - APACHE_DISABLE_REWRITE_IP=1
       - TRUSTED_PROXIES=traefik
+      - SMTP_HOST
+      - MAIL_FROM_ADDRESS
+      - MAIL_DOMAIN
+      - SMTP_AUTHTYPE=PLAIN
     volumes:
       - nextcloud:/var/www/html/
       - nextapps:/var/www/html/custom_apps:cached