From f43e41d7d0e598cf0818d63cfe9933ccc06ddd8c Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Thu, 11 May 2023 11:37:21 +1000
Subject: [PATCH] Fixes for npm user rename

---
 docker/rootfs/etc/nginx/nginx.conf            |  2 +-
 .../s6-overlay/s6-rc.d/prepare/10-npmuser.sh  | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docker/rootfs/etc/nginx/nginx.conf b/docker/rootfs/etc/nginx/nginx.conf
index faf5c4c..a952d4a 100644
--- a/docker/rootfs/etc/nginx/nginx.conf
+++ b/docker/rootfs/etc/nginx/nginx.conf
@@ -1,7 +1,7 @@
 # run nginx in foreground
 daemon off;
 pid /run/nginx/nginx.pid;
-user npmuser;
+user npm;
 
 # Set number of worker processes automatically based on number of CPU cores.
 worker_processes auto;
diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/10-npmuser.sh b/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/10-npmuser.sh
index c5cf543..f82c11c 100755
--- a/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/10-npmuser.sh
+++ b/docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/10-npmuser.sh
@@ -3,18 +3,18 @@
 
 set -e
 
-log_info 'Configuring npmuser ...'
+log_info "Configuring $NPMUSER user ..."
 
-if id -u npmuser; then
+if id -u "$NPMUSER"; then
 	# user already exists
-	usermod -u "$PUID" npmuser || exit 1
+	usermod -u "$PUID" "$NPMUSER" || exit 1
 else
-	# Add npmuser user
-	useradd -o -u "$PUID" -U -d /tmp/npmuserhome -s /bin/false npmuser || exit 1
+	# Add npm user
+	useradd -o -u "$PUID" -U -d "$NPMHOME" -s /bin/false "$NPMUSER" || exit 1
 fi
 
-usermod -G "$PGID" npmuser || exit 1
-groupmod -o -g "$PGID" npmuser || exit 1
-# Home for npmuser
-mkdir -p /tmp/npmuserhome
-chown -R "$PUID:$PGID" /tmp/npmuserhome
+usermod -G "$PGID" "$NPMUSER" || exit 1
+groupmod -o -g "$PGID" "$NPMUSER" || exit 1
+# Home for npm user
+mkdir -p "$NPMHOME"
+chown -R "$PUID:$PGID" "$NPMHOME"