From 800a64a4eaf4b5a5ab577df84cd12f28cd313d61 Mon Sep 17 00:00:00 2001
From: traveler <phil@pncharris.com>
Date: Mon, 14 Apr 2025 21:44:32 -0500
Subject: [PATCH] fds

---
 Caddyfile | 46 ++++++++++++++--------------------------------
 1 file changed, 14 insertions(+), 32 deletions(-)

diff --git a/Caddyfile b/Caddyfile
index ade273b..5abfe79 100755
--- a/Caddyfile
+++ b/Caddyfile
@@ -9,6 +9,14 @@
     }
 }
 
+(email-proxy) {
+    redir https://mail.netgrimoire.com/sogo 301
+}
+
+(mailcow-proxy) {
+    reverse_proxy mailcow-nginx:80
+}
+
 
 cloud.netgrimoire.com {
     reverse_proxy http://nextcloud-aio-apache:11000
@@ -105,43 +113,17 @@ scrutiny.netgrimoire.com  {
     reverse_proxy http://192.168.5.12:8081
 }
 
-(mailcow-proxy) {
-    reverse_proxy mailcow-nginx:80
-}
-
-(mailcow-imap) {
-    reverse_proxy mailcow-nginx:143
-}
-
-(mailcow-smtp) {
-     reverse_proxy mailcow-nginx:587
-}
-
-smtp.netgrimoire.com, smtp.wasted-bandwidth.net, smtp.gnarlypandaproductions.com {
-    import mailcow-smtp
-}
-
-imap.netgrimoire.com, imap.wasted-bandwidth.net, imap.gnarlypandaproductions.com {
-    import mailcow-imap
-}
 
 
-mail.netgrimoire.com, autodiscover.netgrimoire.com, autoconfig.netgrimoire.com {
+
+mail.netgrimoire.com, autodiscover.netgrimoire.com, autoconfig.netgrimoire.com,
+autodiscover.wasted-bandwidth.net, autoconfig.wasted-bandwidth.net,
+autodiscover.gnarlypandaproductions.com, autoconfig.gnarlypandaproductions.com
+
+ {
     import mailcow-proxy
 }
 
-mail.wasted-bandwidth.net, autodiscover.wasted-bandwidth.net, autoconfig.wasted-bandwidth.net {
-    import mailcow-proxy
-}
-
-mail.gnarlypandaproductions.com, autodiscover.gnarlypandaproductions.com, autoconfig.gnarlypandaproductions.com {
-    import mailcow-proxy
-}
-
-(email-proxy) {
-    redir https://mail.netgrimoire.com/sogo 301
-}
-
 
 email.gnarlypandaproductions.com, email.netgrimoire.com, email.wasted-bandwidth.net {
     import email-proxy