Replace caddy by nginx web server

aldettinger · Aug 14, 2023 · 261b40e · 261b40e
1 parent 0453d22
commit 261b40e
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 11 deletions.
diff --git a/test/README.md b/test/README.md
@@ -286,7 +286,7 @@ NCPUS=$(lscpu | grep '^CPU(s):' | awk '{print $2}')
 > This setting is optional and not necessarily recommended for configurations
 > with small number of CPUs and limited disk performance.
 
-Use `./test/bin/start_webserver.sh` to run a caddy web server to serve the
+Use `./test/bin/start_webserver.sh` to run an `nginx` web server to serve the
 images needed for the build.
 
 Use `./test/bin/build_images.sh` to build all of the images for all of the
@@ -371,7 +371,7 @@ $ ./test/bin/manage_hypervisor_config.sh cleanup
 
 #### Creating Test Infrastructure
 
-Use `./test/bin/start_webserver.sh` to run a caddy web server to serve the
+Use `./test/bin/start_webserver.sh` to run an `nginx` web server to serve the
 images needed for the test scenarios.
 
 Use `./test/bin/scenario.sh` to create test infrastructure for a scenario

diff --git a/test/bin/cleanup.sh b/test/bin/cleanup.sh
@@ -12,6 +12,6 @@ for scenario in scenarios/*.sh; do
     ./bin/scenario.sh cleanup "${scenario}"
 done
 
-pkill caddy || true
+sudo pkill nginx || true
 
 rm -rf "${IMAGEDIR}"
diff --git a/test/bin/start_webserver.sh b/test/bin/start_webserver.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
-# This script should be run on the hypervisor to set up a caddy
-# file-server for the images used by Vms running test scenarios.
+# This script should be run on the hypervisor to set up an nginx
+# file-server for the images used by VMs running test scenarios.
 
 set -euo pipefail
 
@@ -13,9 +13,32 @@ echo "Starting web server in ${IMAGEDIR}"
 mkdir -p "${IMAGEDIR}"
 cd "${IMAGEDIR}"
 
-pkill caddy || true
-nohup caddy file-server \
-      --access-log \
-      --browse \
-      --listen "0.0.0.0:${WEB_SERVER_PORT}" \
-      --root "${IMAGEDIR}" >caddy.log 2>&1 &
+NGINX_CONFIG="${IMAGEDIR}/nginx.conf"
+cat > "${NGINX_CONFIG}" <<EOF
+worker_processes 8;
+events {
+}
+http {
+    access_log /dev/null;
+    error_log  ${IMAGEDIR}/nginx_error.log;
+    server {
+        listen 0.0.0.0:${WEB_SERVER_PORT};
+        root   ${IMAGEDIR};
+    }
+}
+pid ${IMAGEDIR}/nginx.pid;
+daemon on;
+EOF
+
+# Allow the current user to write to nginx temporary directories
+sudo chgrp -R "$(id -gn)" /var/lib/nginx
+
+# Kill running nginx processes and wait until down
+sudo pkill nginx || true
+while pidof nginx &>/dev/null ; do
+    sleep 1
+done
+
+nginx \
+    -c "${NGINX_CONFIG}" \
+    -e "${IMAGEDIR}/nginx.log"