Merge pull request 'dev' (#3) from dev into main

Reviewed-on: https://git.mintyserver.net/poslop/DockerConfigs/pulls/3

docker-compose.yml

@@ -1,9 +1,6 @@
 networks:
-  swag:
+  caddy:
-    name: swag
+    name: caddy
-    ipam:
-      config:
-        - subnet: 172.20.0.0/16
   qbit:
     name: qbit
   shoko:
@@ -29,13 +26,11 @@ services:
       - DB_DATABASE=bookstackapp
     volumes:
       - bookstack:/config
-      #ports:
-      #- 6875:80
     restart: unless-stopped
     depends_on:
       - bookstack_db
     networks:
-      - swag
+      - caddy
       - bookstack
   
   bookstack_db:
@@ -73,7 +68,6 @@ services:
       - WIREGUARD_PRIVATE_KEY=${MULLKEY}
       - WIREGUARD_ADDRESSES=10.64.21.169/32
       - SERVER_CITIES=Chicago IL
-        #- LOG_LEVEL=debug
     volumes:
       - gluetun:/gluetun
     ports:
@@ -84,22 +78,6 @@ services:
     networks:
       - qbit
 
-  syncthing:
-    image: lscr.io/linuxserver/syncthing:latest
-    container_name: syncthing
-    environment:
-      - PUID=1000
-      - PGID=1000
-    volumes:
-      - syncdata:/config
-      - /mnt/nextcloud:/mnt/files
-    ports:
-      - 8384:8384
-      - 22000:22000/tcp
-      - 22000:22000/udp
-      - 21027:21027/udp
-    restart: unless-stopped
-
   caddy:
     image: caddy:latest
     container_name: caddy
@@ -116,34 +94,19 @@ services:
       - caddy_data:/data
       - caddy_config:/config
     networks:
-      swag:
+      - caddy
-        ipv4_address: 172.20.0.10
 
 
   technitium:
     container_name: technitium
     image: technitium/dns-server:latest
     network_mode: "host"
-        # ports:
-        #   - "5380:5380/tcp" #DNS web console (HTTP)
-        #   # - "53443:53443/tcp" #DNS web console (HTTPS)
-        #   - "53:53/udp" #DNS service
-        #   - "53:53/tcp" #DNS service
-        #   # - "853:853/udp" #DNS-over-QUIC service
-        #   # - "853:853/tcp" #DNS-over-TLS service
-        #   # - "443:443/udp" #DNS-over-HTTPS service (HTTP/3)
-        #   # - "443:443/tcp" #DNS-over-HTTPS service (HTTP/1.1, HTTP/2)
-        #   # - "80:80/tcp" #DNS-over-HTTP service (use with reverse proxy or certbot certificate renewal)
-        #   # - "8053:8053/tcp" #DNS-over-HTTP service (use with reverse proxy)
-        #   # - "67:67/udp" #DHCP service      
     environment:
-      - DNS_SERVER_DOMAIN=technitium #The primary domain name used by this DNS Server to identify itself.
+      - DNS_SERVER_DOMAIN=technitium 
       - DNS_SERVER_ADMIN_PASSWORD=${PASS}
     volumes:
       - technitium:/etc/dns
     restart: unless-stopped
-      #    sysctls:
-      #      - net.ipv4.ip_local_port_range=1024 65000
 
   prowlarr:
     image: lscr.io/linuxserver/prowlarr:latest
@@ -194,8 +157,6 @@ services:
     depends_on:
       gluetun:
         condition: service_healthy
-      #networks: 
-      #- qbit
 
   shoko:
     shm_size: 256m
@@ -227,7 +188,7 @@ services:
     volumes:
       - vaultwarden:/data
     networks: 
-      - swag
+      - caddy
     ports:
       - 8089:80
 
@@ -244,7 +205,6 @@ services:
       - 18083:18083
     command:
       - "--add-priority-node=p2pmd.xmrvsbeast.com:18080"
-        #- "--add-priority-node=nodes.hashvault.pro:18080"
       - "--out-peers=32"
       - "--in-peers=64"
       - "--disable-dns-checkpoints"
@@ -277,8 +237,6 @@ services:
   ariang:
     image: hurlenko/aria2-ariang
     container_name: aria
-      #ports: 
-      #- 8989:8080
     restart: unless-stopped
     volumes: 
       - /mnt/nextcloud:/aria2/data
@@ -291,8 +249,7 @@ services:
       - BASIC_AUTH_PASSWORD=${PASS}
       - ARIA2RPCPORT=443
     networks:
-      - swag
+      - caddy
-        # network_mode: none
 
   searxng:
     image: searxng/searxng:latest
@@ -301,25 +258,20 @@ services:
       - BASE_URL=https://searxng.mintyserver.net
     volumes:
       - searxng:/etc/searxng
-        #    ports:
-        #      - 8998:8080
     restart: unless-stopped
     networks: 
-      - swag
+      - caddy
 
   puffer:
     image: pufferpanel/pufferpanel:latest
     container_name: puffer
     restart: always
-        #ports:
-        #  - 8081:8080
-        #  - 5657:5657
     volumes:
       - puffer-config:/etc/pufferpanel
       - /var/lib/pufferpanel:/var/lib/pufferpanel
       - /var/run/docker.sock:/var/run/docker.sock
     networks: 
-      - swag
+      - caddy
 
   gitea:
    image: gitea/gitea:latest
@@ -335,9 +287,8 @@ services:
      - /etc/localtime:/etc/localtime:ro
    ports:
      - "3030:3000"
-       #  - "222:22"
    networks: 
-     - swag
+     - caddy
  
   jellyfin:
     image: lscr.io/linuxserver/jellyfin:latest
@@ -352,33 +303,12 @@ services:
       - jellyfin:/config
       - /mnt/massdrive/media:/data
     ports:
-        #   - 7359:7359/udp
-        #   - 1900:1900/udp
       - 8096:8096
     restart: unless-stopped
     networks:
-      - swag
+      - caddy
       - 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
-
   nextcloud:
     container_name: nextcloud-aio-mastercontainer
     init: true
@@ -388,13 +318,10 @@ services:
       - nextcloud_aio_mastercontainer:/mnt/docker-aio-config
       - /var/run/docker.sock:/var/run/docker.sock:ro
     ports:
-      # - 8666:80
       - 8080:8080
-        # - 8443:8443
     environment:
       - APACHE_PORT=11000
       - APACHE_IP_BINDING=0.0.0.0
-        #- NEXTCLOUD_DATADIR=/mnt/docker/configs/ncaio
       - NEXTCLOUD_MOUNT=/mnt/nextcloud/
       - NEXTCLOUD_MEMORY_LIMIT=4096M
 
@@ -448,15 +375,6 @@ volumes:
     name: bitmonero
   p2pool-data:
     name: p2pool-data
-  swag:
-    name: swag
-  syncdata:
-    name: syncdata
-    external: true
-  librewolf-conf:
-    name: librewolf-conf
-  firefox:
-    name: firefox
   gluetun:
     name: gluetun
   bookstack: