From 0022cf31617dde11ebc8e314676475e918e82780 Mon Sep 17 00:00:00 2001
From: Steffen Beyer <steffen@beyer.io>
Date: Thu, 2 Apr 2026 11:38:56 +0200
Subject: [PATCH] Fix Tribes node update CLI and ACME routing

---
 tribes/packages/cli.scm | 8 ++------
 tribes/system/node.scm  | 1 +
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/tribes/packages/cli.scm b/tribes/packages/cli.scm
index b454e47..6b08e6e 100644
--- a/tribes/packages/cli.scm
+++ b/tribes/packages/cli.scm
@@ -12,7 +12,6 @@
        (use-modules (ice-9 format)
                     (ice-9 ftw)
                     (ice-9 match)
-                    (ice-9 posix)
                     (srfi srfi-1))
 
        (define channels-file "/etc/tribes/channels.sexp")
@@ -20,10 +19,7 @@
        (define system-guix "/run/current-system/profile/bin/guix")
 
        (define (home-directory)
-         (let ((entry (getpwuid (getuid))))
-           (if entry
-               (passwd:dir entry)
-               "/root")))
+         (or (getenv "HOME") "/root"))
 
        (define (pulled-guix)
          (string-append (home-directory) "/.config/guix/current/bin/guix"))
@@ -42,7 +38,7 @@
          (format port "  os update    Pull channels and reconfigure the OS.~%"))
 
        (define (require-root)
-         (unless (zero? (getuid))
+         (unless (string=? (or (getenv "USER") "") "root")
            (format (current-error-port)
                    "tribes os update must run as root.~%")
            (exit 1)))
diff --git a/tribes/system/node.scm b/tribes/system/node.scm
index 20d76b2..7caf831 100644
--- a/tribes/system/node.scm
+++ b/tribes/system/node.scm
@@ -113,6 +113,7 @@
     "}\n\n"
     "sub vcl_recv {\n"
     "  if (req.url ~ \"^/\\\\.well-known/acme-challenge/\") {\n"
+    "    set req.backend_hint = acme;\n"
     "    return (pass);\n"
     "  }\n\n"
     "  return (synth(750));\n"