From dd9d422bc6baab96f545a2cc8fe33091500ac225 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 25 Jun 2021 17:29:48 -0400
Subject: [PATCH] Have and use a home directory
---
nixos/modules/deployment.nix | 5 +++++
nixos/modules/update-deployment | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/nixos/modules/deployment.nix b/nixos/modules/deployment.nix
index 19cf7395..bd8f06fc 100755
--- a/nixos/modules/deployment.nix
+++ b/nixos/modules/deployment.nix
@@ -34,6 +34,11 @@ in {
# Without some shell no login is possible at all, even to execute our
# restricted command.
useDefaultShell = true;
+
+ # Without a home directory, lots of tools break.
+ createHome = true;
+ home = "/home/deployment";
+
openssh.authorizedKeys.keys = [
(restrictedKey {
inherit (cfg) authorizedKey gridName;
diff --git a/nixos/modules/update-deployment b/nixos/modules/update-deployment
index 4f5ecd40..43f1ad91 100755
--- a/nixos/modules/update-deployment
+++ b/nixos/modules/update-deployment
@@ -12,7 +12,7 @@ else
BRANCH="${GRIDNAME}"
fi
-CHECKOUT="/run/user/$(id --user)/PrivateStorageio"
+CHECKOUT="${HOME}/PrivateStorageio"
REPO="https://whetstone.privatestorage.io/privatestorage/PrivateStorageio.git"
if [ -e "${CHECKOUT}" ]; then
@@ -24,7 +24,7 @@ else
git -C "${CHECKOUT}" checkout "${BRANCH}"
fi
-echo "$(date --iso-8601=seconds) $(git -C "${CHECKOUT}" rev-parse HEAD)" >> /var/log/updates.txt
+echo "$(date --iso-8601=seconds) $(git -C "${CHECKOUT}" rev-parse HEAD)" >> ${HOME}/updates.txt
nix-shell "${CHECKOUT}"/shell.nix --command "
morph deploy \"${CHECKOUT}\"/morph/grid/\"${GRIDNAME}\"/grid.nix switch --on \"$(hostname)\"
--
GitLab