From e7952e97f884bccbd3ff3d34770c5fd56c4b7ffc Mon Sep 17 00:00:00 2001
From: poslop <bcb@airmail.cc>
Date: Fri, 11 Oct 2024 15:27:12 -0500
Subject: [PATCH] convert technitium to stack

---
 .../Documentation/gitea-stack.yml             |  3 --
 .../Documentation/vaultwarden-stack.yml       |  8 +++-
 .../Networking/technitium-stack.yml           | 25 +++++++++++
 .../Shared/docker-compose.networks.yml        | 13 ------
 .../{Searxng => Tools}/searxng-stack.yml      |  0
 docker-compose.yml                            | 44 -------------------
 6 files changed, 31 insertions(+), 62 deletions(-)
 create mode 100644 docker-compose.d/Networking/technitium-stack.yml
 delete mode 100644 docker-compose.d/Shared/docker-compose.networks.yml
 rename docker-compose.d/{Searxng => Tools}/searxng-stack.yml (100%)

diff --git a/docker-compose.d/Documentation/gitea-stack.yml b/docker-compose.d/Documentation/gitea-stack.yml
index 48406c0..2fd2c97 100644
--- a/docker-compose.d/Documentation/gitea-stack.yml
+++ b/docker-compose.d/Documentation/gitea-stack.yml
@@ -5,13 +5,10 @@ services:
      - GITEA__service__DISABLE_REGISTRATION=true
      - USER_UID=1000
      - USER_GID=1000
-   restart: always
    volumes:
      - gitea:/data
      - /etc/timezone:/etc/timezone:ro
      - /etc/localtime:/etc/localtime:ro
-     #ports:
-     #- "3030:3000"
    networks: 
      - caddy
 
diff --git a/docker-compose.d/Documentation/vaultwarden-stack.yml b/docker-compose.d/Documentation/vaultwarden-stack.yml
index 85ebb9b..54121c0 100644
--- a/docker-compose.d/Documentation/vaultwarden-stack.yml
+++ b/docker-compose.d/Documentation/vaultwarden-stack.yml
@@ -10,8 +10,8 @@ services:
       - vaultwarden:/data
     networks:
       - caddy
-      #ports:
-      #- 8089:80
+    secrets:
+      - PASS
 
 networks:
   caddy:
@@ -21,3 +21,7 @@ networks:
 volumes:
   vaultwarden:
     name: vaultwarden
+
+secrets:
+  PASS:
+    external: true
diff --git a/docker-compose.d/Networking/technitium-stack.yml b/docker-compose.d/Networking/technitium-stack.yml
new file mode 100644
index 0000000..5dc8072
--- /dev/null
+++ b/docker-compose.d/Networking/technitium-stack.yml
@@ -0,0 +1,25 @@
+services:
+  technitium:
+    image: technitium/dns-server:latest
+    environment:
+      - DNS_SERVER_DOMAIN=technitium
+      - DNS_SERVER_ADMIN_PASSWORD=/run/secrets/PASS
+    volumes:
+      - technitium:/etc/dns
+    secrets:
+      - PASS
+    networks:
+      - host
+
+volumes:
+  technitium:
+    name: technitium
+
+secrets:
+  PASS:
+    external: true
+
+networks:
+  host:
+    name: host
+    external: true
diff --git a/docker-compose.d/Shared/docker-compose.networks.yml b/docker-compose.d/Shared/docker-compose.networks.yml
deleted file mode 100644
index 422fdfd..0000000
--- a/docker-compose.d/Shared/docker-compose.networks.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-networks:
-  caddy:
-    name: caddy
-  qbit:
-    name: qbit
-  shoko:
-    name: shoko
-  arr:
-    name: arr
-  bookstack:
-    name: bookstack
-
diff --git a/docker-compose.d/Searxng/searxng-stack.yml b/docker-compose.d/Tools/searxng-stack.yml
similarity index 100%
rename from docker-compose.d/Searxng/searxng-stack.yml
rename to docker-compose.d/Tools/searxng-stack.yml
diff --git a/docker-compose.yml b/docker-compose.yml
index adfc9dd..931ed75 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,20 +11,6 @@ networks:
     name: arr
 
 services:
-  anki:
-    image: ghcr.io/luckyturtledev/anki
-    container_name: anki
-    environment:
-      - SYNC_USER1=poslop:${PASS}
-      - RUST_LOG=info
-    ports: 
-      - 10080:8080
-    volumes:
-      - anki:/data
-    restart: unless-stopped
-    networks:
-      - caddy
-
   gluetun:
     image: ghcr.io/qdm12/gluetun
     cap_add:
@@ -64,18 +50,6 @@ services:
     networks:
       - caddy
 
-
-  technitium:
-    container_name: technitium
-    image: technitium/dns-server:latest
-    network_mode: "host"
-    environment:
-      - DNS_SERVER_DOMAIN=technitium 
-      - DNS_SERVER_ADMIN_PASSWORD=${PASS}
-    volumes:
-      - technitium:/etc/dns
-    restart: unless-stopped
-
   prowlarr:
     image: lscr.io/linuxserver/prowlarr:latest
     container_name: prowlarr
@@ -201,17 +175,6 @@ services:
     networks:
       - caddy
 
-  puffer:
-    image: pufferpanel/pufferpanel:latest
-    container_name: puffer
-    restart: always
-    volumes:
-      - puffer-config:/etc/pufferpanel
-      - /var/lib/pufferpanel:/var/lib/pufferpanel
-      - /var/run/docker.sock:/var/run/docker.sock
-    networks: 
-      - caddy
-
   nextcloud:
     container_name: nextcloud-aio-mastercontainer
     init: true
@@ -236,8 +199,6 @@ services:
 
 
 volumes:
-  anki:
-    name: anki
   caddy_config:
     name: caddy_config
   caddy_data:
@@ -254,11 +215,6 @@ volumes:
     external: true
   ariang:
     name: ariang
-  puffer-config:
-    name: puffer-config
-  technitium:
-    name: technitium
-    external: true
   sonarr:
     name: sonarr
   prowlarr: