From 13195373cca495bb572ff4b5826e83d2c0485153 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauri=20R=C3=A4s=C3=A4nen?= <git@nullprop.sh>
Date: Sun, 27 Apr 2025 21:23:29 +0300
Subject: [PATCH] Use user run dir for beszel socket

---
 scripts/beszel.sh | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/scripts/beszel.sh b/scripts/beszel.sh
index a0f9b82..60b9022 100755
--- a/scripts/beszel.sh
+++ b/scripts/beszel.sh
@@ -15,9 +15,9 @@ podman run -d \
   --name beszel \
   --restart=unless-stopped \
   -v /srv/beszel:/beszel_data \
-  -v /run/beszel_socket:/beszel_socket \
+  -v $XDG_RUNTIME_DIR/beszel_socket:/beszel_socket \
   -p 8090:8090 \
-  docker.io/henrygd/beszel
+  docker.io/henrygd/beszel:latest
 
 # https://beszel.dev/guide/agent-installation
 read -p "Agent public key: " pub_key
@@ -27,7 +27,7 @@ podman run -d \
   --network host \
   --restart unless-stopped \
   -v $XDG_RUNTIME_DIR/podman/podman.sock:$XDG_RUNTIME_DIR/podman/podman.sock:ro \
-  -v /run/beszel_socket:/beszel_socket \
+  -v $XDG_RUNTIME_DIR/beszel_socket:/beszel_socket \
   -e KEY="$pub_key" \
   -e LISTEN=/beszel_socket/beszel.sock \
   docker.io/henrygd/beszel-agent:latest
@@ -35,11 +35,23 @@ podman run -d \
 mkdir -p "$HOME/.config/systemd/user"
 cd "$HOME/.config/systemd/user"
 
+# TODO probably want to use quadlet instead
 podman generate systemd --restart-policy=always --new --files --name beszel
 podman generate systemd --restart-policy=always --new --files --name beszel-agent
 podman stop beszel
 podman stop beszel-agent
 
+echo "You should make sure systemd creates RuntimeDirectory for socket"
+echo "[Service]"
+echo "RuntimeDirectory=beszel_socket"
+echo "RuntimeDirectoryPreserve=yes"
+
+read -p "Open services in vim? [Y/n]: " prompt
+if [[ $prompt != "n" ]]; then
+    vim container-beszel.service
+    vim container-beszel-agent.service
+fi
+
 systemctl --user start container-beszel
 systemctl --user start container-beszel-agent