From dfa280fffd312b064eb69913d9774a48a679b7c3 Mon Sep 17 00:00:00 2001
From: Cian Hughes <chughes000@gmail.com>
Date: Tue, 16 Dec 2025 14:47:58 +0000
Subject: [PATCH] Partial fix of metrics container

---
 home-manager/homeserver/containers/caddy.nix   | 3 ++-
 home-manager/homeserver/containers/metrics.nix | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/home-manager/homeserver/containers/caddy.nix b/home-manager/homeserver/containers/caddy.nix
index 0884341..5a19a75 100644
--- a/home-manager/homeserver/containers/caddy.nix
+++ b/home-manager/homeserver/containers/caddy.nix
@@ -21,10 +21,11 @@
       volumes = [
         "/home/cianh/caddy/config:/etc/caddy"
         "/home/cianh/caddy/data:/data:Z"
-        "/home/cianh/caddy/placeholder_site:/var/www/site:Z"
         "/home/cianh/caddy/logs:/var/log/caddy"
+        "/home/cianh/caddy/placeholder_site:/var/www/site:Z"
         "/home/cianh/blog:/var/www/blog:Z"
         "/home/cianh/Nextcloud:/var/www/nextcloud:Z"
+        "/home/cianh/goaccess/site:/var/www/goaccess:Z"
       ];
     };
   };
diff --git a/home-manager/homeserver/containers/metrics.nix b/home-manager/homeserver/containers/metrics.nix
index 1bf94dc..845f7f9 100644
--- a/home-manager/homeserver/containers/metrics.nix
+++ b/home-manager/homeserver/containers/metrics.nix
@@ -13,15 +13,15 @@
     };
     containers = {
       goaccess = {
-        image = "allinurl/goaccess:latest";
-        command = "/var/log/caddy/access.log -o /var/www/goaccess/index.html --log-format=CADDY --tz=Europe/Dublin --anonymize-ip --real-time-html --ws-url=wss://metrics.example.com/ws --port=7890";
+        image = "docker.io/allinurl/goaccess:latest";
+        exec = "--output=/var/www/goaccess/index.html --log-file=/var/log/caddy/access.log --log-format=CADDY --tz=Europe/Dublin --anonymize-ip --real-time-html --ws-url=wss://metrics.example.com/ws --origin=https://metrics.bulba.space --port=7890";
         autoUpdate = "registry";
         network = [
-          "metrics-net"
+          "proxy-net"
         ];
         volumes = [
           "/home/cianh/caddy/logs:/var/log/caddy"
-          "/home/cianh/goaccess/data:/var/www/goaccess"
+          "/home/cianh/goaccess/site:/var/www/goaccess"
         ];
       };
     };