From f6b16013e0577963c686062327837d5a9557bf5c Mon Sep 17 00:00:00 2001
From: Richie Cahill <Richie@tmmworkshop.com>
Date: Mon, 27 May 2024 16:30:26 -0400
Subject: [PATCH] testing docker network

---
 systems/jeeves/docker/default.nix | 10 ++++++++++
 systems/jeeves/docker/web.nix     | 25 +++++--------------------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/systems/jeeves/docker/default.nix b/systems/jeeves/docker/default.nix
index 50b46c6..05bb246 100644
--- a/systems/jeeves/docker/default.nix
+++ b/systems/jeeves/docker/default.nix
@@ -1,3 +1,4 @@
+{ pkgs, config, ... }:
 {
   imports = [
     ./filebrowser.nix
@@ -6,4 +7,13 @@
   ];
 
   virtualisation.oci-containers.backend = "docker";
+
+  system.activationScripts.mkVPN =
+    let
+      docker = config.virtualisation.oci-containers.backend;
+      dockerBin = "${pkgs.${docker}}/bin/${docker}";
+    in
+    ''
+      ${dockerBin} network inspect web >/dev/null 2>&1 || ${dockerBin} network create web --subnet 172.20.0.0/16
+    '';
 }
diff --git a/systems/jeeves/docker/web.nix b/systems/jeeves/docker/web.nix
index 99225f6..bee1b8d 100644
--- a/systems/jeeves/docker/web.nix
+++ b/systems/jeeves/docker/web.nix
@@ -1,29 +1,10 @@
 {
   virtualisation.oci-containers.containers = {
-    qbit = {
-      image = "ghcr.io/linuxserver/qbittorrent";
-      ports = [
-        "6881:6881"
-        "6881:6881/udp"
-        "8082:8082"
-        "29432:29432"
-      ];
-      volumes = [
-        "/ZFS/Media/Docker/Docker/Storage/qbit:/config"
-        "/ZFS/Torenting/Qbit/:/data"
-      ];
-      environment = {
-        PUID = "998";
-        PGID = "100";
-        TZ = "America/New_York";
-        WEBUI_PORT = "8082";
-      };
-      autoStart = true;
-    };
     grafana = {
       image = "grafana/grafana-enterprise";
       volumes = [ "/ZFS/Media/Docker/Docker/Storage/grafana:/var/lib/grafana" ];
       user = "998:998";
+      extraOptions = [ "--network=web" ];
       autoStart = true;
     };
     dnd_file_server = {
@@ -32,6 +13,7 @@
         "/ZFS/Media/Docker/Docker/templates/file_server/sites/:/etc/apache2/sites-enabled/"
         "/ZFS/Storage/Main/Table_Top/:/data"
       ];
+      extraOptions = [ "--network=web" ];
       autoStart = true;
     };
     arch_mirror = {
@@ -41,6 +23,7 @@
         "/ZFS/Media/Mirror/:/data"
       ];
       ports = [ "800:80" ];
+      extraOptions = [ "--network=web" ];
       autoStart = true;
     };
     haproxy = {
@@ -59,6 +42,7 @@
         "arch_mirror"
         "dnd_file_server"
       ];
+      extraOptions = [ "--network=web" ];
       autoStart = true;
     };
     cloud_flare_tunnel = {
@@ -69,6 +53,7 @@
       ];
       environmentFiles = [ "/ZFS/Media/Docker/Docker/jeeves/web/cloudflare_tunnel.env" ];
       dependsOn = [ "haproxy" ];
+      extraOptions = [ "--network=web" ];
       autoStart = true;
     };
   };