From 633b0e70a33391987ce953d185c9ac0ab0d64426 Mon Sep 17 00:00:00 2001 From: poslop Date: Mon, 15 Jul 2024 10:00:50 -0500 Subject: [PATCH 1/4] removed old swag stuff --- docker-compose.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f827ea9..d23fd83 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,9 @@ networks: - swag: - name: swag - ipam: - config: - - subnet: 172.20.0.0/16 + caddy: + name: caddy + #ipam: + #config: + # - subnet: 172.20.0.0/16 qbit: name: qbit shoko: @@ -35,7 +35,7 @@ services: depends_on: - bookstack_db networks: - - swag + - caddy - bookstack bookstack_db: @@ -116,8 +116,8 @@ services: - caddy_data:/data - caddy_config:/config networks: - swag: - ipv4_address: 172.20.0.10 + - caddy + #ipv4_address: 172.20.0.10 technitium: @@ -227,7 +227,7 @@ services: volumes: - vaultwarden:/data networks: - - swag + - caddy ports: - 8089:80 @@ -291,7 +291,7 @@ services: - BASIC_AUTH_PASSWORD=${PASS} - ARIA2RPCPORT=443 networks: - - swag + - caddy # network_mode: none searxng: @@ -305,7 +305,7 @@ services: # - 8998:8080 restart: unless-stopped networks: - - swag + - caddy puffer: image: pufferpanel/pufferpanel:latest @@ -319,7 +319,7 @@ services: - /var/lib/pufferpanel:/var/lib/pufferpanel - /var/run/docker.sock:/var/run/docker.sock networks: - - swag + - caddy gitea: image: gitea/gitea:latest @@ -337,7 +337,7 @@ services: - "3030:3000" # - "222:22" networks: - - swag + - caddy jellyfin: image: lscr.io/linuxserver/jellyfin:latest @@ -357,7 +357,7 @@ services: - 8096:8096 restart: unless-stopped networks: - - swag + - caddy - shoko #swag: @@ -365,7 +365,7 @@ services: # image: lscr.io/linuxserver/swag:latest # restart: unless-stopped # volumes: - # - swag:/config + # - caddy:/config # environment: # - PUID=1000 # - PGID=1000 @@ -377,7 +377,7 @@ services: # - 443:443 # - 80:80 # networks: - # - swag + # - caddy nextcloud: container_name: nextcloud-aio-mastercontainer From bad8c2fd67627b2dd12ab3437ac33140d2e545b2 Mon Sep 17 00:00:00 2001 From: poslop Date: Mon, 15 Jul 2024 10:11:59 -0500 Subject: [PATCH 2/4] removed syncthing --- docker-compose.yml | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index d23fd83..cbdfa98 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,6 @@ networks: caddy: name: caddy - #ipam: - #config: - # - subnet: 172.20.0.0/16 qbit: name: qbit shoko: @@ -360,25 +357,6 @@ services: - caddy - shoko - #swag: - # container_name: swag - # image: lscr.io/linuxserver/swag:latest - # restart: unless-stopped - # volumes: - # - caddy:/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: - # - caddy - nextcloud: container_name: nextcloud-aio-mastercontainer init: true @@ -448,15 +426,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: From 857b3c52563179447f2b1badb6b80234015a486d Mon Sep 17 00:00:00 2001 From: poslop Date: Mon, 15 Jul 2024 10:12:32 -0500 Subject: [PATCH 3/4] removed syncthing --- docker-compose.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index cbdfa98..8f06224 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -81,22 +81,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 From ec2abac2dc5bc89774fc1b7b52701065f72df80f Mon Sep 17 00:00:00 2001 From: poslop Date: Mon, 15 Jul 2024 10:15:39 -0500 Subject: [PATCH 4/4] removed lots of unnecessary comments --- docker-compose.yml | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8f06224..18af700 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,8 +26,6 @@ services: - DB_DATABASE=bookstackapp volumes: - bookstack:/config - #ports: - #- 6875:80 restart: unless-stopped depends_on: - bookstack_db @@ -70,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: @@ -98,33 +95,18 @@ services: - caddy_config:/config networks: - 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 @@ -175,8 +157,6 @@ services: depends_on: gluetun: condition: service_healthy - #networks: - #- qbit shoko: shm_size: 256m @@ -225,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" @@ -258,8 +237,6 @@ services: ariang: image: hurlenko/aria2-ariang container_name: aria - #ports: - #- 8989:8080 restart: unless-stopped volumes: - /mnt/nextcloud:/aria2/data @@ -273,7 +250,6 @@ services: - ARIA2RPCPORT=443 networks: - caddy - # network_mode: none searxng: image: searxng/searxng:latest @@ -282,8 +258,6 @@ services: - BASE_URL=https://searxng.mintyserver.net volumes: - searxng:/etc/searxng - # ports: - # - 8998:8080 restart: unless-stopped networks: - caddy @@ -292,9 +266,6 @@ services: 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 @@ -316,7 +287,6 @@ services: - /etc/localtime:/etc/localtime:ro ports: - "3030:3000" - # - "222:22" networks: - caddy @@ -333,8 +303,6 @@ services: - jellyfin:/config - /mnt/massdrive/media:/data ports: - # - 7359:7359/udp - # - 1900:1900/udp - 8096:8096 restart: unless-stopped networks: @@ -350,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