Update to 0.166-1

3 files changed, 34 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a57f933dd9c1..fd8c775b2b25 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = kvmd
 	pkgdesc = The main Pi-KVM daemon
-	pkgver = 0.165
+	pkgver = 0.166
 	pkgrel = 1
 	url = https://github.com/pi-kvm/kvmd
 	arch = any
@@ -26,7 +26,7 @@ pkgbase = kvmd
 	depends = raspberrypi-io-access
 	optdepends = dkms
 	optdepends = tc358743-dkms
-	source = https://github.com/pi-kvm/kvmd/archive/v0.165.tar.gz
+	source = https://github.com/pi-kvm/kvmd/archive/v0.166.tar.gz
 	md5sums = SKIP
 
 pkgname = kvmd
diff --git a/PKGBUILD b/PKGBUILD
index 3b78b0c5149d..07419949f026 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ for _platform in $PIKVM_PLATFORM; do
 	done
 done
 pkgbase=kvmd
-pkgver=0.165
+pkgver=0.166
 pkgrel=1
 pkgdesc="The main Pi-KVM daemon"
 url="https://github.com/pi-kvm/kvmd"
@@ -65,6 +65,7 @@ package_kvmd() {
 
 	mkdir -p "$pkgdir/usr/lib/systemd/system"
 	cp configs/os/systemd/*.service "$pkgdir/usr/lib/systemd/system"
+	cp configs/os/tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/kvmd.conf"
 
 	mkdir -p "$pkgdir/usr/share/kvmd"
 	cp -r web "$pkgdir/usr/share/kvmd"
@@ -78,7 +79,7 @@ package_kvmd() {
 	find "$pkgdir" -name ".gitignore" -delete
 	sed -i -e "s/^#PROD//g" "$_cfgdir/nginx/nginx.conf"
 	find "$_cfgdir" -type f -exec chmod 444 '{}' \;
-	chmod 440 "$_cfgdir/kvmd"/*passwd
+	chmod 400 "$_cfgdir/kvmd"/*passwd
 
 	mkdir -p "$pkgdir/etc/kvmd/nginx/ssl"
 	chmod 750 "$pkgdir/etc/kvmd/nginx/ssl"
@@ -87,7 +88,8 @@ package_kvmd() {
 	done
 	rm "$pkgdir/etc/kvmd"/{auth.yaml,meta.yaml}
 	cp "$_cfgdir/kvmd"/{auth.yaml,meta.yaml} "$pkgdir/etc/kvmd"
-	cp -a "$_cfgdir/kvmd/"*passwd "$pkgdir/etc/kvmd"
+	cp "$_cfgdir/kvmd/"*passwd "$pkgdir/etc/kvmd"
+	chmod 600 "$_cfgdir/kvmd/"*passwd
 	for path in "$_cfgdir/nginx"/*.conf; do
 		ln -sf "/usr/share/kvmd/configs.default/nginx/`basename $path`" "$pkgdir/etc/kvmd/nginx"
 	done
diff --git a/kvmd.install b/kvmd.install
index 3e504d4852ed..42e9645dda39 100644
--- a/kvmd.install
+++ b/kvmd.install
@@ -8,19 +8,36 @@ post_install() {
 post_upgrade() {
 	echo "==> Configuring KVMD users and groups ..."
 
-	id kvmd &>/dev/null || useradd -r -c "The main Pi-KVM daemon" -s /sbin/nologin kvmd
-	for group in gpio uucp systemd-journal; do
-		(groupmems -l -g "$group" | grep kvmd >/dev/null) || groupmems -g "$group" -a kvmd
-	done
+	_create_user kvmd "Pi-KVM - The main daemon"
+	_add_user_to_group kvmd gpio
+	_add_user_to_group kvmd uucp
+	_add_user_to_group kvmd systemd-journal
 
-	id kvmd-nginx &>/dev/null || useradd -r -c "Pi-KVM Nginx Server" -s /sbin/nologin kvmd-nginx
-	(groupmems -l -g kvmd | grep kvmd-nginx >/dev/null) || groupmems -g kvmd -a kvmd-nginx
+	_create_user kvmd-ipmi "Pi-KVM - IPMI to KVMD proxy"
+	_add_user_to_group kvmd-ipmi kvmd
 
-	chown root:kvmd \
-		/usr/share/kvmd/configs.default/kvmd/*passwd \
-		/etc/kvmd/*passwd
+	_create_user kvmd-nginx "Pi-KVM - HTTP entrypoint"
+	_add_user_to_group kvmd-nginx kvmd
+
+	chown kvmd:kvmd /etc/kvmd/htpasswd
+	chown kvmd-ipmi:kvmd-ipmi /etc/kvmd/ipmipasswd
+	chmod 600 /etc/kvmd/*passwd
 }
 
 post_remove() {
-	userdel kvmd &>/dev/null
+	_delete_user kvmd-nginx
+	_delete_user kvmd-ipmi
+	_delete_user kvmd
+}
+
+_create_user() {
+	id "$1" &>/dev/null || useradd -r -c "$2" -s /sbin/nologin "$1"
+}
+
+_delete_user() {
+	userdel "$1" &>/dev/null
+}
+
+_add_user_to_group() {
+	(groupmems -l -g "$2" | grep "$1" >/dev/null) || groupmems -g "$2" -a "$1"
 }