From de4bf3da89a9203425fd8e3fc4237ed17623af79 Mon Sep 17 00:00:00 2001
From: Richie Cahill <Richie@tmmworkshop.com>
Date: Thu, 20 Jun 2024 22:20:08 -0400
Subject: [PATCH] removed Docker/Docker/Storage and Docker/Docker

---
 systems/jeeves/docker/internal.nix | 12 ++++++------
 systems/jeeves/docker/web.nix      | 13 ++++++-------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/systems/jeeves/docker/internal.nix b/systems/jeeves/docker/internal.nix
index 29b9f7e..7f9a76e 100644
--- a/systems/jeeves/docker/internal.nix
+++ b/systems/jeeves/docker/internal.nix
@@ -9,7 +9,7 @@
         "29432:29432"
       ];
       volumes = [
-        "/zfs/media/Docker/Docker/Storage/qbit:/config"
+        "/zfs/media/docker/configs/qbit:/config"
         "/zfs/torrenting/qbit/:/data"
       ];
       environment = {
@@ -29,7 +29,7 @@
         "8118:8118"
       ];
       volumes = [
-        "/zfs/media/Docker/Docker/Storage/qbitvpn:/config"
+        "/zfs/media/docker/configs/qbitvpn:/config"
         "/zfs/torrenting/qbitvpn/:/data"
         "/etc/localtime:/etc/localtime:ro"
       ];
@@ -48,7 +48,7 @@
         DELUGE_DAEMON_LOG_LEVEL = "debug";
         DELUGE_WEB_LOG_LEVEL = "debug";
       };
-      environmentFiles = [ "/zfs/media/Docker/Docker/jeeves/internal/qbitvpn.env" ];
+      environmentFiles = [ "/zfs/media/docker/qbitvpn.env" ];
       autoStart = true;
     };
     prowlarr = {
@@ -58,7 +58,7 @@
         PGID = "100";
         TZ = "America/New_York";
       };
-      volumes = [ "/zfs/media/Docker/Docker/Storage/prowlarr:/config" ];
+      volumes = [ "/zfs/media/docker/configs/prowlarr:/config" ];
       autoStart = true;
     };
     radarr = {
@@ -69,7 +69,7 @@
         TZ = "America/New_York";
       };
       volumes = [
-        "/zfs/media/Docker/Docker/Storage/radarr:/config"
+        "/zfs/media/docker/configs/radarr:/config"
         "/ZFS/storage/Plex/Movies:/movies"
         "/zfs/torrenting/qbitvpn:/data"
       ];
@@ -83,7 +83,7 @@
         TZ = "America/New_York";
       };
       volumes = [
-        "/zfs/media/Docker/Docker/Storage/sonarr:/config"
+        "/zfs/media/docker/configs/sonarr:/config"
         "/ZFS/storage/Plex/TV:/tv"
         "/zfs/torrenting/qbitvpn:/data"
       ];
diff --git a/systems/jeeves/docker/web.nix b/systems/jeeves/docker/web.nix
index 721f01b..97472fd 100644
--- a/systems/jeeves/docker/web.nix
+++ b/systems/jeeves/docker/web.nix
@@ -2,7 +2,7 @@
   virtualisation.oci-containers.containers = {
     grafana = {
       image = "grafana/grafana-enterprise";
-      volumes = [ "/zfs/media/Docker/Docker/Storage/grafana:/var/lib/grafana" ];
+      volumes = [ "/zfs/media/docker/configs/grafana:/var/lib/grafana" ];
       user = "998:998";
       extraOptions = [ "--network=web" ];
       autoStart = true;
@@ -10,7 +10,7 @@
     dnd_file_server = {
       image = "ubuntu/apache2:latest";
       volumes = [
-        "/zfs/media/Docker/Docker/templates/file_server/sites/:/etc/apache2/sites-enabled/"
+        "/zfs/media/docker/templates/file_server/sites/:/etc/apache2/sites-enabled/"
         "/ZFS/storage/Main/Table_Top/:/data"
       ];
       extraOptions = [ "--network=web" ];
@@ -19,7 +19,7 @@
     arch_mirror = {
       image = "ubuntu/apache2:latest";
       volumes = [
-        "/zfs/media/Docker/Docker/templates/file_server/sites/:/etc/apache2/sites-enabled/"
+        "/zfs/media/docker/templates/file_server/sites/:/etc/apache2/sites-enabled/"
         "/zfs/media/Mirror/:/data"
       ];
       ports = [ "800:80" ];
@@ -33,9 +33,8 @@
         TZ = "Etc/EST";
       };
       volumes = [
-        "/zfs/media/Docker/Docker/jeeves/web/haproxy/cloudflare.pem:/etc/ssl/certs/cloudflare.pem"
-        "/zfs/media/Docker/Docker/jeeves/web/haproxy/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg"
-        "/zfs/media/Docker/Docker/jeeves/web/haproxy/API:/run/haproxy/"
+        "/zfs/media/docker/cloudflare.pem:/etc/ssl/certs/cloudflare.pem"
+        "/zfs/media/docker/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg"
       ];
       dependsOn = [
         "grafana"
@@ -51,7 +50,7 @@
         "tunnel"
         "run"
       ];
-      environmentFiles = [ "/zfs/media/Docker/Docker/jeeves/web/cloudflare_tunnel.env" ];
+      environmentFiles = [ "/zfs/media/docker/cloudflare_tunnel.env" ];
       dependsOn = [ "haproxy" ];
       extraOptions = [ "--network=web" ];
       autoStart = true;