From 9c56e5359c158b4f616ffad7cd2ea2478dee6e39 Mon Sep 17 00:00:00 2001
From: Lieuwe Leene <lieuwe@leene.dev>
Date: Sat, 19 Nov 2022 18:55:06 +0100
Subject: [PATCH] WIP: need to include SMTP relay

---
 config/nginx/header_default | 10 ----------
 docker-compose.yaml         | 19 +++++++++++++++++++
 local.env                   |  4 +++-
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/config/nginx/header_default b/config/nginx/header_default
index 53a7e80..971b5d0 100644
--- a/config/nginx/header_default
+++ b/config/nginx/header_default
@@ -1,13 +1,3 @@
-## Start of configuration add by letsencrypt container
-location ^~ /.well-known/acme-challenge/ {
-    auth_basic off;
-    auth_request off;
-    allow all;
-    root /usr/share/nginx/html;
-    try_files $uri =404;
-    break;
-}
-## End of configuration add by letsencrypt container
 add_header Referrer-Policy "no-referrer" always;
 add_header X-Content-Type-Options "nosniff" always;
 add_header X-Download-Options "noopen" always;
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 035eb66..e3efdba 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -192,6 +192,25 @@ services:
       - USERNAME=${DNS_USERNAME}
       - PASSWORD=${DNS_PASSWORD}
 
+  autodiscover:
+    image: monogramm/autodiscover-email-settings:latest
+    container_name: autodiscover
+    environment:
+      - VIRTUAL_HOST=autodiscover.${NGINX_HOST},autoconfig.${NGINX_HOST}
+      - VIRTUAL_PORT=8000
+      - DOMAIN=${NGINX_HOST}
+      - IMAP_HOST=mail.${NGINX_HOST}
+      - IMAP_PORT=993
+      - IMAP_SOCKET=SSL
+      - POP_HOST=mail.${NGINX_HOST}
+      - POP_PORT=995
+      - POP_SOCKET=SSL
+      - SMTP_HOST=mail.${NGINX_HOST}
+      - SMTP_PORT=587
+      - SMTP_SOCKET=STARTTLS
+    expose:
+      - "8000"
+
 volumes:
   acme-state:
   gitea_data:
diff --git a/local.env b/local.env
index 1d03bf8..1074543 100644
--- a/local.env
+++ b/local.env
@@ -10,7 +10,6 @@ TZ=Europe/Berlin
 ENABLE_SPAMASSASSIN=1
 SPAMASSASSIN_SPAM_TO_INBOX=1
 ENABLE_CLAMAV=1
-ENABLE_DNSBL=1
 ENABLE_FAIL2BAN=1
 ENABLE_POSTGREY=1
 ENABLE_SASLAUTHD=0
@@ -18,6 +17,9 @@ ONE_DIR=1
 TLS_LEVEL=modern
 ENABLE_UPDATE_CHECK=1
 SSL_TYPE=letsencrypt
+SPOOF_PROTECTION=1
+ENABLE_POP3=1
+ENABLE_DNSBL=1
 
 ## SQL Server Env
 POSTGRES_USER="pgadmin"