Added docker-compose file

Dockerfile

@@ -7,6 +7,6 @@ RUN make
 FROM debian:stable-slim AS run
 RUN apt-get update -y && apt-get upgrade -y && apt-get install -y libgnutls28-dev libgnutls30
 COPY --from=build /swebs/build/swebs /usr/sbin/swebs
-COPY ./site /site
+RUN useradd -M swebs
 
 ENTRYPOINT [ "swebs", "-s", "/site/sitefile" ]

docker-compose.yml

@@ -0,0 +1,9 @@
+version: "3"
+services:
+  swebs:
+    image: natechoe/swebs
+    ports:
+      - "8000:8000"
+    volumes:
+      - ./site/:/site/
+    working_dir: "/site/"

example/sitefile

@@ -1,20 +0,0 @@
-define port 8000
-
-#define transport TLS
-define key domain.key
-define cert domain.crt
-define timeout 2000
-define library ./library.so
-
-set host localhost:8000
-read / site/index.html
-read /hello  site/hello.html
-throw /blog/forbidden 403
-read /blog/.* site/blog/
-#/blog/2021-1-25.html turns into site/blog//blog/2021-1-25.html
-linked /library
-set host 127.0.0.1:8000
-read / site/easteregg.html
-read /egg.png site/egg.png
-set host .*
-read /alldomains site/alldomains.html

site/README

@@ -1,2 +1,5 @@
 This is a blog site. Ideally you wouldn't use any relative path names, but for
 portability reasons I'm assuming that swebs is being run in this directory.
+
+Relative path names do work with docker, but relative path names scare me, and
+they should scare you too.

site/sitefile

@@ -1,4 +1,20 @@
-define transport TCP
 define port 8000
 
-read .* /site/
+#define transport TLS
+define key domain.key
+define cert domain.crt
+define timeout 2000
+define library ./library.so
+
+set host localhost:8000
+read / site/index.html
+read /hello  site/hello.html
+throw /blog/forbidden 403
+read /blog/.* site/blog/
+#/blog/2021-1-25.html turns into site/blog//blog/2021-1-25.html
+linked /library
+set host 127.0.0.1:8000
+read / site/easteregg.html
+read /egg.png site/egg.png
+set host .*
+read /alldomains site/alldomains.html

src/main.c

@@ -174,8 +174,7 @@ int main(int argc, char **argv) {
 		int fd;
 		int lowestProc;
 
-		fd = accept(listener->fd, (struct sockaddr *) &listener->addr,
-				&listener->addrlen);
+		fd = acceptConnection(listener);
 		if (fd < 0) {
 			if (errno == ENOTSOCK || errno == EOPNOTSUPP ||
 					errno == EINVAL) {

src/setup.c

@@ -134,13 +134,13 @@ NULL
 	}
 
 	*site = parseSitefile(sitefile);
-	if (site == NULL) {
+	if (*site == NULL) {
 		fprintf(stderr, "Invalid sitefile %s\n", sitefile);
 		exit(EXIT_FAILURE);
 	}
 
 	*listener = createListener((*site)->port, backlog);
-	if (listener == NULL) {
+	if (*listener == NULL) {
 		fprintf(stderr, "Failed to create socket\n");
 		exit(EXIT_FAILURE);
 	}