From a2904cbbb588411094d2c4390e1eebe7097e2521 Mon Sep 17 00:00:00 2001
From: traveler <phil@pncharris.com>
Date: Tue, 20 May 2025 12:49:22 -0500
Subject: [PATCH] wer

---
 Caddyfile      | 10 +++++++---
 caddy.yaml     |  4 ++--
 roundcube.yaml |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Caddyfile b/Caddyfile
index 0df6efb..c33f851 100755
--- a/Caddyfile
+++ b/Caddyfile
@@ -116,9 +116,13 @@ scrutiny.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  {
+mail.netgrimoire.com,autodiscover.netgrimoire.com, autoconfig.netgrimoire.com, \
+mail.wasted-bandwidth.net, autodiscover.wasted-bandwidth.net, autoconfig.wasted-bandwidth.net, \
+mail.gnarlypandaproductions.com, autodiscover.gnarlypandaproductions.com, autoconfig.gnarlypandaproductions.com, \
+mail.pncfishandmore.com, autodiscover.pncfishandmore.com, autoconfig.pncfishandmore.com, \
+mail.pncharrisenterprises.com, autodiscover.pncharrisenterprises.com, autoconfig.pncharrisenterprises.com,
+mail.pnharris.com, autodiscover.pncharris.com, autoconfig.pncharris.com, \
+mail.florosafd.org, autodiscover.florosafd.org, autoconfig.florosafd.org \{
     import mailcow-proxy
 }
 
diff --git a/caddy.yaml b/caddy.yaml
index 8e3bf01..5cd1b06 100755
--- a/caddy.yaml
+++ b/caddy.yaml
@@ -6,10 +6,10 @@ configs:
 
 services:
   caddy:
-    #image: lucaslorentz/caddy-docker-proxy:ci-alpine
+    image: lucaslorentz/caddy-docker-proxy:ci-alpine
     #image: ghcr.io/serfriz/caddy-crowdsec:latest
     #image: caddy-crowdsec
-    image: git.netgrimoire.com/traveler/caddy-crowdsec
+    #image: git.netgrimoire.com/traveler/caddy-crowdsec
     ports:
       - 8900:80
       - 443:443
diff --git a/roundcube.yaml b/roundcube.yaml
index 68d46a6..25bbdf5 100755
--- a/roundcube.yaml
+++ b/roundcube.yaml
@@ -33,7 +33,7 @@ services:
         - homepage.description=E-mail client
         - kuma.rc.http.name="Mealie"
         - kuma.mrc.http.url=http://roundcube:80
-        - caddy=webmail.netgrimoire.com, webmail.gnarlypandaproductions.com
+        - caddy=webmail.netgrimoire.com, webmail.gnarlypandaproductions.com, webmail.pcharris.com, webmail.pncfishandmore.com, webmail.pncharrisenterprises.com, webmail.florosafd.org
         # - caddy.import=authentik
         - caddy.reverse_proxy="{{upstreams 80}}"
       placement: