From 51927e3f7cbf4ef43d2da672f3fee70c496fafdf Mon Sep 17 00:00:00 2001 From: Jacob Yundt Date: Mon, 30 Dec 2024 18:31:33 -0500 Subject: [PATCH] feat: Create headscale user and group as system user/groups When creating the headscale user and group, create both as system groups rather than creating them as 'user' groups. FIXES #2278 --- docs/packaging/postinstall.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/packaging/postinstall.sh b/docs/packaging/postinstall.sh index 2bc8970310..08f0cf62b8 100644 --- a/docs/packaging/postinstall.sh +++ b/docs/packaging/postinstall.sh @@ -31,13 +31,13 @@ ensure_headscale_path() { create_headscale_user() { printf "PostInstall: Adding headscale user %s\n" "$HEADSCALE_USER" - useradd -s "$HEADSCALE_SHELL" -d "$HEADSCALE_HOME_DIR" -c "headscale default user" "$HEADSCALE_USER" + useradd -r -s "$HEADSCALE_SHELL" -d "$HEADSCALE_HOME_DIR" -c "headscale default user" "$HEADSCALE_USER" } create_headscale_group() { if command -V systemctl >/dev/null 2>&1; then printf "PostInstall: Adding headscale group %s\n" "$HEADSCALE_GROUP" - groupadd "$HEADSCALE_GROUP" + groupadd -r "$HEADSCALE_GROUP" printf "PostInstall: Adding headscale user %s to group %s\n" "$HEADSCALE_USER" "$HEADSCALE_GROUP" usermod -a -G "$HEADSCALE_GROUP" "$HEADSCALE_USER" @@ -45,7 +45,7 @@ create_headscale_group() { if [ "$ID" = "alpine" ]; then printf "PostInstall: Adding headscale group %s\n" "$HEADSCALE_GROUP" - addgroup "$HEADSCALE_GROUP" + addgroup -S "$HEADSCALE_GROUP" printf "PostInstall: Adding headscale user %s to group %s\n" "$HEADSCALE_USER" "$HEADSCALE_GROUP" addgroup "$HEADSCALE_USER" "$HEADSCALE_GROUP"