From b6d3ff36f8e3d672bc2f1b12d5931f71ae118904 Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Sun, 7 May 2017 23:11:48 +0200 Subject: [PATCH] Add httpd(8) support. --- Makefile | 8 ++++++++ libc/include/sys/cdefs.h | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/Makefile b/Makefile index c38628fe..e39b9a1a 100644 --- a/Makefile +++ b/Makefile @@ -141,6 +141,9 @@ sysroot-fsh: mkdir -p "$(SYSROOT)/var/empty" -m 555 mkdir -p "$(SYSROOT)/var/log" mkdir -p "$(SYSROOT)/var/run" + mkdir -p "$(SYSROOT)/var/www" + mkdir -p "$(SYSROOT)/var/www/logs" + mkdir -p "$(SYSROOT)/var/www/htdocs" ln -sfT . "$(SYSROOT)/usr" .PHONY: sysroot-base-headers @@ -175,6 +178,9 @@ sysroot-system: sysroot-fsh sysroot-base-headers echo /var/empty >> "$(SYSROOT)/tix/manifest/system" echo /var/log >> "$(SYSROOT)/tix/manifest/system" echo /var/run >> "$(SYSROOT)/tix/manifest/system" + echo /var/www >> "$(SYSROOT)/tix/manifest/system" + echo /var/www/logs >> "$(SYSROOT)/tix/manifest/system" + echo /var/www/htdocs >> "$(SYSROOT)/tix/manifest/system" echo "$(HOST_MACHINE)" > "$(SYSROOT)/etc/machine" echo /etc/machine >> "$(SYSROOT)/tix/manifest/system" (echo 'NAME="Sortix"' && \ @@ -341,7 +347,9 @@ $(LIVE_INITRD): sysroot mkdir -p $(LIVE_INITRD).d/etc/init echo require single-user exit-code > $(LIVE_INITRD).d/etc/init/default echo "root::0:0:root:/root:sh" > $(LIVE_INITRD).d/etc/passwd + echo "www::1:1:www:/var/www:sh" >> $(LIVE_INITRD).d/etc/passwd echo "root::0:root" > $(LIVE_INITRD).d/etc/group + echo "www::1:www" >> $(LIVE_INITRD).d/etc/group mkdir -p $(LIVE_INITRD).d/home mkdir -p $(LIVE_INITRD).d/root -m 700 cp -RT "$(SYSROOT)/etc/skel" $(LIVE_INITRD).d/root diff --git a/libc/include/sys/cdefs.h b/libc/include/sys/cdefs.h index 7615bd44..9d4768fe 100644 --- a/libc/include/sys/cdefs.h +++ b/libc/include/sys/cdefs.h @@ -112,6 +112,10 @@ this macro. */ #undef __SORTIX_HAS_WORKING_PRIVSEP__ +/* TODO: Define when the main stack will automatically grow. Remove when httpd + is updated to not rely on this macro. */ +#undef __SORTIX_HAS_GROWING_STACK__ + /* TODO: Define when initgroups(2) is implemented. Remove when ssh is updated to not rely on this macro. */ #undef __SORTIX_HAS_INITGROUPS__