switched to caddy

caddyreload

@@ -0,0 +1,2 @@
+caddy_container_id=$(docker ps | grep caddy | awk '{print $1;}')
+docker exec -w /etc/caddy $caddy_container_id caddy reload

docker-compose.yml

@@ -1,6 +1,9 @@
 networks:
   swag:
     name: swag
+    ipam:
+      config:
+        - subnet: 172.20.0.0/16
   qbit:
     name: qbit
   shoko:
@@ -8,42 +11,28 @@ networks:
   arr:
     name: arr
 
-volumes:
-  vaultwarden:
-    name: vaultwarden
-  qbittorrent:
-    name: qbittorrent
-  shoko:
-    name: shoko
-  ariang:
-    name: ariang
-  puffer-config:
-    name: puffer-config
-  puffer-lib:
-    name: puffer-lib
-  searxng:
-    name: searxng
-  jellyfin: 
-    name: jellyfin
-  gitea:
-    name: gitea
-  technitium:
-    name: technitium
-  sonarr:
-    name: sonarr
-  prowlarr:
-    name: prowlarr
-  nextcloud_aio_mastercontainer:
-    name: nextcloud_aio_mastercontainer
-  bitmonero:
-    name: bitmonero
-  p2pool-data:
-    name: p2pool-data
-  swag:
-    name: swag
-
 services:
 
+  caddy:
+    image: caddy:latest
+    container_name: caddy
+    restart: unless-stopped
+    cap_add:
+      - NET_ADMIN
+    ports:
+      - 80:80
+      - 443:443
+      - 443:443/udp
+    volumes:
+      - caddy_set:/etc/caddy
+      - caddy_srv:/srv
+      - caddy_data:/data
+      - caddy_config:/config
+    networks:
+      swag:
+        ipv4_address: 172.20.0.10
+
+
   technitium:
     container_name: technitium
     image: technitium/dns-server:latest
@@ -255,8 +244,8 @@ services:
      - gitea:/data
      - /etc/timezone:/etc/timezone:ro
      - /etc/localtime:/etc/localtime:ro
-       #ports:
-       #  - "3030:3000"
+   ports:
+     - "3030:3000"
        #  - "222:22"
    networks: 
      - swag
@@ -282,24 +271,24 @@ services:
       - swag
       - shoko
 
-  swag:
-    container_name: swag
-    image: lscr.io/linuxserver/swag:latest
-    restart: unless-stopped
-    volumes:
-      - swag:/config
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=America/Chicago
-      - URL=mintyserver.net
-      - VALIDATION=http 
-      - SUBDOMAINS=aria,git,nextcloud,jelly,searxng,puffer,vault
-    ports:
-      - 443:443
-      - 80:80
-    networks: 
-      - swag
+        #swag:
+        #  container_name: swag
+        #  image: lscr.io/linuxserver/swag:latest
+        #  restart: unless-stopped
+        #  volumes:
+        #    - swag:/config
+        #  environment:
+        #    - PUID=1000
+        #    - PGID=1000
+        #    - TZ=America/Chicago
+        #    - URL=mintyserver.net
+        #    - VALIDATION=http 
+        #    - SUBDOMAINS=aria,git,nextcloud,jelly,searxng,puffer,vault
+        #  ports:
+        #    - 443:443
+        #    - 80:80
+        #  networks: 
+        #    - swag
 
   nextcloud:
     container_name: nextcloud-aio-mastercontainer
@@ -325,3 +314,47 @@ services:
     container_name: watchtower
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
+
+
+volumes:
+  caddy_config:
+    name: caddy_config
+  caddy_data:
+    name: caddy_data
+  caddy_srv:
+    name: caddy_srv
+  caddy_set:
+    name: caddy_set
+  vaultwarden:
+    name: vaultwarden
+  qbittorrent:
+    name: qbittorrent
+  shoko:
+    name: shoko
+  ariang:
+    name: ariang
+  puffer-config:
+    name: puffer-config
+  puffer-lib:
+    name: puffer-lib
+  searxng:
+    name: searxng
+  jellyfin: 
+    name: jellyfin
+  gitea:
+    name: gitea
+  technitium:
+    name: technitium
+  sonarr:
+    name: sonarr
+  prowlarr:
+    name: prowlarr
+  nextcloud_aio_mastercontainer:
+    name: nextcloud_aio_mastercontainer
+  bitmonero:
+    name: bitmonero
+  p2pool-data:
+    name: p2pool-data
+  swag:
+    name: swag
+