commit 5cb760a576f76158868a55de2df706f05ac81c90c165aeb995848fe5f8faf1ec from: Stefan Sperling date: Tue Jun 17 14:30:20 2025 UTC build and install gotwebd in gotsysd regress VMs commit - cce714eb843da63066edc7ee431d41961024dfb653453b104b528337eb262563 commit + 5cb760a576f76158868a55de2df706f05ac81c90c165aeb995848fe5f8faf1ec blob - 3dbe89fd5a6ba0f60eb52ccbf641429560f59a4da4ddf2df3de2a2b6c93b08a2 blob + f712d61fa8338ec579e0ce4ab9cdc5cf4b13e64cec0a5de623aface6052d5479 --- 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 - cb819bae414332fcb5fb247c484fe9e62762bbe6ff563a931a236580eacf5f85 blob + fd6df1bc72a7ffdde0206f28efa79e6983b34baf41c98e5459bd73adfc9fbe89 --- 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