From 13b930685896de27d7f60ded5703798a079f2dcf Mon Sep 17 00:00:00 2001
From: 3wc <3wc.git@doesthisthing.work>
Date: Fri, 6 Nov 2020 19:29:13 +0200
Subject: [PATCH] Remove needless compose.mailrelay.yml

---
 .envrc.sample         |  9 ++++-----
 compose.mailrelay.yml | 13 -------------
 compose.yml           |  1 +
 3 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 compose.mailrelay.yml

diff --git a/.envrc.sample b/.envrc.sample
index bf5f4df..847a9ff 100644
--- a/.envrc.sample
+++ b/.envrc.sample
@@ -10,6 +10,10 @@ export MEDIAWIKI_EMAIL_CONTACT="info@wiki.example.com"
 export MEDIAWIKI_EMAIL_FROM="wiki@wiki.example.com"
 export MEDIAWIKI_LOGO_FILE='$wgResourceBasePath/resources/assets/wiki.png'
 
+## SMTP
+#export SMTP_HOST=postfix_relay_app
+#export SMTP_HOST=mailu_front
+
 export DB_ROOT_PASSWORD_VERSION=v1
 export DB_PASSWORD_VERSION=v1
 export MEDIAWIKI_SECRET_KEY_VERSION=v1
@@ -44,8 +48,3 @@ export PHP_INI_VERSION=v1
 # export OPENID_KEYCLOAK_URL="https://keycloak.local:8080/auth/realms/acme/"
 # export OPENID_CLIENT_ID="mediawiki"
 # export OPENID_CLIENT_SECRET_VERSION=v1
-
-## SMTP
-#export COMPOSE_FILE="compose.yml:compose.mailrelay.yml"
-#export SMTP_HOST=postfix_relay_app
-#export SMTP_HOST=mailu_front
diff --git a/compose.mailrelay.yml b/compose.mailrelay.yml
deleted file mode 100644
index 553286b..0000000
--- a/compose.mailrelay.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-version: "3.8"
-
-services:
-  app:
-    environment:
-      - SMTP_HOST=${SMTP_HOST}
-    networks:
-      - mail
-
-networks:
-  mail:
-    external: true
diff --git a/compose.yml b/compose.yml
index 3f6d80b..6540e8d 100644
--- a/compose.yml
+++ b/compose.yml
@@ -17,6 +17,7 @@ services:
       - DB_HOST=db
       - DB_USER=mediawiki
       - DB_NAME=mediawiki
+      - SMTP_HOST
     volumes:
       - "mediawiki_images:/var/www/html/images"
     configs: