commit 89dafad3e9c76df8c7e59b991262efea9763be5b
from: Stefan Sperling <stsp@stsp.name>
via: Thomas Adam <thomas@xteddy.org>
date: Sat Jun 21 09:24:15 2025 UTC

build and install gotwebd in gotsysd regress VMs

commit - 13cfc96365853c01cc8457b33890eb86e2c2e019
commit + 89dafad3e9c76df8c7e59b991262efea9763be5b
blob - abd401aefe45b62119a435f102459a11c297f574
blob + 78e4fcdc0abf1630c98b1706dda411909c331c5f
--- regress/gotsysd/Makefile
+++ regress/gotsysd/Makefile
@@ -31,6 +31,7 @@ GOTSYSD_UID=600	# /usr/ports/infrastructure/db/user.li
 GOTSYS_CONF=gotsys.conf
 GOT_CONF=got.conf
 GOTSYS_REPO=gotsys.git
+GOTWEBD_UID=593	# /usr/ports/infrastructure/db/user.list
 
 GOTSYSD_TEST_USER?=${DOAS_USER}
 .if empty(GOTSYSD_TEST_USER)
@@ -206,7 +207,7 @@ setup_test_vm: start_test_vm ${GOTD_CONF} ${GOTSYSD_CO
 	${UNPRIV} "${GOTSYSD_SSH_CMD} ${GOTSYSD_TEST_USER}@$${VMIP} \
 		mkdir -p src/got bin"; \
 	${UNPRIV} "${GOTSYSD_SCP_CMD} -r \
-		${.CURDIR}/../../{Makefile*,cvg,got*,git*,lib*,include,tog} \
+		${.CURDIR}/../../{Makefile*,cvg,got*,git*,lib*,include,tog,template} \
 		${GOTSYSD_TEST_USER}@$${VMIP}:src/got/"; \
 	${UNPRIV} "${GOTSYSD_SCP_CMD} build-got.sh \
 		${GOTSYSD_TEST_USER}@$${VMIP}:bin/"; \
@@ -214,7 +215,7 @@ setup_test_vm: start_test_vm ${GOTD_CONF} ${GOTSYSD_CO
 		./bin/build-got.sh"; \
 	${UNPRIV} "${GOTSYSD_SSH_CMD} root@$${VMIP} \
 		make -C /home/${GOTSYSD_TEST_USER}/src/got -- GOT_RELEASE=Yes \
-		DEBUG=\\'-Oo -g\\' sysd-install server-install install"; \
+		DEBUG=\\'-Oo -g\\' sysd-install server-install webd-install install"; \
 	${UNPRIV} "${GOTSYSD_SSH_CMD} -- root@$${VMIP} \
 		ln -s gitwrapper /usr/local/bin/git-upload-pack"; \
 	${UNPRIV} "${GOTSYSD_SSH_CMD} -- root@$${VMIP} \
@@ -255,6 +256,11 @@ setup_test_vm: start_test_vm ${GOTD_CONF} ${GOTSYSD_CO
 		${GOTSYSD_CONF} root@$${VMIP}:/etc/gotsysd.conf"; \
 	${UNPRIV} "${GOTSYSD_SSH_CMD} root@$${VMIP} \
 		/usr/local/sbin/gotsysd -vvv"; \
+	${UNPRIV} "${GOTSYSD_SSH_CMD} root@$${VMIP} \
+		groupadd -g ${GOTWEBD_UID} _gotwebd"; \
+	${UNPRIV} "${GOTSYSD_SSH_CMD} root@$${VMIP} \
+		useradd -d /nonexistent -s /sbin/nologin \
+		-u ${GOTWEBD_UID} -g ${GOTWEBD_UID} _gotwebd"; \
 	
 stop_test_vm: ensure_root
 	@vmctl stop ${GOTSYSD_VM_NAME}
blob - 80b714d3935abb473d8650b7e8c2ad8a1c750ba4
blob + ab9f8e028981ae8b39e96c7b16278cb912c60b83
--- regress/gotsysd/build-got.sh
+++ regress/gotsysd/build-got.sh
@@ -14,5 +14,5 @@ for d in got* git* lib*; do
 	fi
 done
 
-echo "Building gotsysd, gotd, and got:"
-make -s GOT_RELEASE=Yes DEBUG="-O0 -g" sysd server all
+echo "Building gotsysd, gotd, gotwebd, and got:"
+make -s GOT_RELEASE=Yes DEBUG="-O0 -g" sysd server webd all