From bf3f0996eb7f02cb4fc07173e721de4cbc02c847 Mon Sep 17 00:00:00 2001
From: RyuuPendragon <ryuu@ryuu.in>
Date: Mon, 23 Jun 2025 18:29:28 +0530
Subject: [PATCH] Update caddy

---
 caddy-reverse-proxy/docker-compose.yml | 16 --------
 caddy/docker-compose-crowdsec.yml      | 52 ++++++++++++++++++++++++++
 caddy/docker-compose.yml               | 29 ++++++++++++++
 3 files changed, 81 insertions(+), 16 deletions(-)
 delete mode 100644 caddy-reverse-proxy/docker-compose.yml
 create mode 100644 caddy/docker-compose-crowdsec.yml
 create mode 100644 caddy/docker-compose.yml

diff --git a/caddy-reverse-proxy/docker-compose.yml b/caddy-reverse-proxy/docker-compose.yml
deleted file mode 100644
index 4498ed2..0000000
--- a/caddy-reverse-proxy/docker-compose.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-services:
-  caddy-reverse-proxy:
-    image: caddy:2.10.0
-    container_name: caddy-reverse-proxy
-    cap_add:
-      - NET_ADMIN
-    volumes:
-      - ${APPDATA_PATH}/caddy-reverse-proxy/caddy:/etc/caddy
-      - ${APPDATA_PATH}/caddy-reverse-proxy/config:/config
-      - ${APPDATA_PATH}/caddy-reverse-proxy/data:/data
-      - ${APPDATA_PATH}/caddy-reverse-proxy/log:/var/log/caddy
-      - ${APPDATA_PATH}/caddy-reverse-proxy/srv:/srv
-    ports:
-      - "${HTTP}:80"
-      - "${HTTPS}:443"
-    restart: unless-stopped
diff --git a/caddy/docker-compose-crowdsec.yml b/caddy/docker-compose-crowdsec.yml
new file mode 100644
index 0000000..bb1bd0f
--- /dev/null
+++ b/caddy/docker-compose-crowdsec.yml
@@ -0,0 +1,52 @@
+services:
+  caddy:
+    image: ryuupendragon/caddy-crowdsec:2.10.0
+    container_name: caddy
+    cap_add:
+      - NET_ADMIN
+    networks:
+      proxy:
+        ipv4_address: 172.30.0.2
+    environment:
+      - CROWDSEC_API_KEY=${CROWDSEC_API_KEY}
+    volumes:
+      - ${APPDATA_PATH}/caddy-crowdsec/caddy:/etc/caddy
+      - ${APPDATA_PATH}/caddy-crowdsec/caddy-config:/config
+      - ${APPDATA_PATH}/caddy-crowdsec/caddy-data:/data
+      - ${APPDATA_PATH}/caddy-crowdsec/caddy-logs:/logs
+      - ${APPDATA_PATH}/caddy-crowdsec/caddy-srv:/srv
+    ports:
+      - ${HTTP_PORT}:80
+      - ${HTTPS_PORT}:443
+      - ${HTTPS_PORT}:443/udp
+    restart: unless-stopped
+
+  crowdsec:
+    image: crowdsecurity/crowdsec:v1.6.9
+    container_name: crowdsec
+    networks:
+      proxy:
+        ipv4_address: 172.30.0.3
+    environment:
+      - BOUNCER_KEY_CADDY=${CROWDSEC_API_KEY}
+      - TZ=${TZ}
+      - GID=${GID}
+      - COLLECTIONS=crowdsecurity/linux crowdsecurity/caddy crowdsecurity/appsec-generic-rules crowdsecurity/appsec-virtual-patching
+    volumes:
+      - ${APPDATA_PATH}/caddy-crowdsec/crowdsec-acquis.d:/etc/crowdsec/acquis.d
+      - ${APPDATA_PATH}/caddy-crowdsec/crowdsec-db:/var/lib/crowdsec/data/
+      - ${APPDATA_PATH}/caddy-crowdsec/crowdsec-config:/etc/crowdsec/
+      - ${APPDATA_PATH}/caddy-crowdsec/caddy-logs:/var/log/caddy:ro
+    ports:
+      - ${CROWDSEC_PORT}:8080
+      - ${APPSEC_PORT}:7422
+    restart: unless-stopped
+
+networks:
+  proxy:
+    name: proxy
+    driver: bridge
+    ipam:
+     config:
+       - subnet: 172.30.0.0/16
+         gateway: 172.30.0.1
diff --git a/caddy/docker-compose.yml b/caddy/docker-compose.yml
new file mode 100644
index 0000000..da02d04
--- /dev/null
+++ b/caddy/docker-compose.yml
@@ -0,0 +1,29 @@
+services:
+  caddy:
+    image: caddy:2.10.0
+    container_name: caddy
+    cap_add:
+      - NET_ADMIN
+    networks:
+      proxy:
+        ipv4_address: 172.30.0.2
+    volumes:
+      - ${APPDATA_PATH}/caddy/caddy:/etc/caddy
+      - ${APPDATA_PATH}/caddy/config:/config
+      - ${APPDATA_PATH}/caddy/data:/data
+      - ${APPDATA_PATH}/caddy/log:/var/log/caddy
+      - ${APPDATA_PATH}/caddy/srv:/srv
+    ports:
+      - ${HTTP_PORT}:80
+      - ${HTTPS_PORT}:443
+      - ${HTTPS_PORT}:443/udp
+    restart: unless-stopped
+
+networks:
+  proxy:
+    name: proxy
+    driver: bridge
+    ipam:
+     config:
+       - subnet: 172.30.0.0/16
+         gateway: 172.30.0.1