From a7362dcabafc25b5d7afa0b07f723b66c3cf862c Mon Sep 17 00:00:00 2001
From: Richie Cahill <Richie@tmmworkshop.com>
Date: Fri, 5 Jul 2024 13:39:30 -0400
Subject: [PATCH] setup vars for jeevesjr

---
 systems/jeeves-jr/docker/vars.nix | 11 -----------
 systems/jeeves-jr/docker/web.nix  |  9 ++++++---
 systems/jeeves-jr/vars.nix        | 11 +++++++++++
 3 files changed, 17 insertions(+), 14 deletions(-)
 delete mode 100644 systems/jeeves-jr/docker/vars.nix
 create mode 100644 systems/jeeves-jr/vars.nix

diff --git a/systems/jeeves-jr/docker/vars.nix b/systems/jeeves-jr/docker/vars.nix
deleted file mode 100644
index 9c84e07..0000000
--- a/systems/jeeves-jr/docker/vars.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-let
-  zfs_main = "/ZFS/Main";
-in
-{
-  inherit zfs_main;
-  # main
-  main_docker = "${zfs_main}/docker";
-  main_docker_configs = "${zfs_main}/docker/configs";
-  main_docker_templates = "${zfs_main}/docker/templates";
-  main_mirror = "${zfs_main}/mirror";
-}
diff --git a/systems/jeeves-jr/docker/web.nix b/systems/jeeves-jr/docker/web.nix
index 336ef1d..a42a6a4 100644
--- a/systems/jeeves-jr/docker/web.nix
+++ b/systems/jeeves-jr/docker/web.nix
@@ -1,9 +1,12 @@
+let
+  vars = import ../vars.nix;
+in
 {
   virtualisation.oci-containers.containers = {
     arch_mirror = {
       image = "ubuntu/apache2:latest";
       volumes = [
-        "/ZFS/Main/Docker/templates/file_server/sites/:/etc/apache2/sites-enabled/"
+        "${vars.main_docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/"
         "/ZFS/Main/Mirror/:/data"
       ];
       ports = [ "800:80" ];
@@ -17,7 +20,7 @@
         TZ = "Etc/EST";
       };
       volumes = [
-        "/ZFS/Main/Docker/jeeves-jr/haproxy/cloudflare.pem:/etc/ssl/certs/cloudflare.pem"
+        "${vars.main_docker}/jeeves-jr/haproxy/cloudflare.pem:/etc/ssl/certs/cloudflare.pem"
         "${./haproxy.cfg}:/usr/local/etc/haproxy/haproxy.cfg"
       ];
       dependsOn = [ "arch_mirror" ];
@@ -30,7 +33,7 @@
         "tunnel"
         "run"
       ];
-      environmentFiles = [ "/ZFS/Main/Docker/jeeves-jr/cloudflare_tunnel.env" ];
+      environmentFiles = [ "${vars.main_docker}/jeeves-jr/cloudflare_tunnel.env" ];
       dependsOn = [ "haproxy" ];
       extraOptions = [ "--network=web" ];
       autoStart = true;
diff --git a/systems/jeeves-jr/vars.nix b/systems/jeeves-jr/vars.nix
new file mode 100644
index 0000000..25a484f
--- /dev/null
+++ b/systems/jeeves-jr/vars.nix
@@ -0,0 +1,11 @@
+let
+  zfs_main = "/ZFS/Main";
+in
+{
+  inherit zfs_main;
+  # main
+  main_docker = "${zfs_main}/Docker";
+  main_docker_configs = "${zfs_main}/Docker/configs";
+  main_docker_templates = "${zfs_main}/Docker/templates";
+  main_mirror = "${zfs_main}/Mirror";
+}