mirror of
https://github.com/juanfont/headscale.git
synced 2026-03-13 05:35:15 +09:00
feat: Create headscale user and group as system user/groups (#2322)
Some checks are pending
Build / build-nix (push) Waiting to run
Build / build-cross (GOARCH=386 GOOS=linux) (push) Waiting to run
Build / build-cross (GOARCH=amd64 GOOS=darwin) (push) Waiting to run
Build / build-cross (GOARCH=amd64 GOOS=linux) (push) Waiting to run
Build / build-cross (GOARCH=arm GOOS=linux GOARM=5) (push) Waiting to run
Build / build-cross (GOARCH=arm GOOS=linux GOARM=6) (push) Waiting to run
Build / build-cross (GOARCH=arm GOOS=linux GOARM=7) (push) Waiting to run
Build / build-cross (GOARCH=arm64 GOOS=darwin) (push) Waiting to run
Build / build-cross (GOARCH=arm64 GOOS=linux) (push) Waiting to run
Deploy docs / deploy (push) Waiting to run
Tests / test (push) Waiting to run
Some checks are pending
Build / build-nix (push) Waiting to run
Build / build-cross (GOARCH=386 GOOS=linux) (push) Waiting to run
Build / build-cross (GOARCH=amd64 GOOS=darwin) (push) Waiting to run
Build / build-cross (GOARCH=amd64 GOOS=linux) (push) Waiting to run
Build / build-cross (GOARCH=arm GOOS=linux GOARM=5) (push) Waiting to run
Build / build-cross (GOARCH=arm GOOS=linux GOARM=6) (push) Waiting to run
Build / build-cross (GOARCH=arm GOOS=linux GOARM=7) (push) Waiting to run
Build / build-cross (GOARCH=arm64 GOOS=darwin) (push) Waiting to run
Build / build-cross (GOARCH=arm64 GOOS=linux) (push) Waiting to run
Deploy docs / deploy (push) Waiting to run
Tests / test (push) Waiting to run
When creating the headscale user and group, create both as system groups rather than creating them as 'user' groups. FIXES #2278
This commit is contained in:
@@ -31,13 +31,13 @@ ensure_headscale_path() {
|
|||||||
|
|
||||||
create_headscale_user() {
|
create_headscale_user() {
|
||||||
printf "PostInstall: Adding headscale user %s\n" "$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() {
|
create_headscale_group() {
|
||||||
if command -V systemctl >/dev/null 2>&1; then
|
if command -V systemctl >/dev/null 2>&1; then
|
||||||
printf "PostInstall: Adding headscale group %s\n" "$HEADSCALE_GROUP"
|
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"
|
printf "PostInstall: Adding headscale user %s to group %s\n" "$HEADSCALE_USER" "$HEADSCALE_GROUP"
|
||||||
usermod -a -G "$HEADSCALE_GROUP" "$HEADSCALE_USER"
|
usermod -a -G "$HEADSCALE_GROUP" "$HEADSCALE_USER"
|
||||||
@@ -45,7 +45,7 @@ create_headscale_group() {
|
|||||||
|
|
||||||
if [ "$ID" = "alpine" ]; then
|
if [ "$ID" = "alpine" ]; then
|
||||||
printf "PostInstall: Adding headscale group %s\n" "$HEADSCALE_GROUP"
|
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"
|
printf "PostInstall: Adding headscale user %s to group %s\n" "$HEADSCALE_USER" "$HEADSCALE_GROUP"
|
||||||
addgroup "$HEADSCALE_USER" "$HEADSCALE_GROUP"
|
addgroup "$HEADSCALE_USER" "$HEADSCALE_GROUP"
|
||||||
|
|||||||
Reference in New Issue
Block a user