Upload 32 files

src/server.sh

@@ -46,16 +46,37 @@ if [[ "${WEB:-}" != [Nn]* ]]; then
   fi
 
   # Start webserver
-  # Ensure nginx has a writable PID file: prefer /run/nginx.pid, otherwise use /run/shm/nginx.pid
+  # Prefer using pid directive from /etc/nginx/nginx.conf if present to avoid
+  # duplicate-pid errors when passing -g. Otherwise fall back to passing -g.
   mkdir -p /run /run/shm
-  PID_FILE="/run/nginx.pid"
-  if ! touch "$PID_FILE" 2>/dev/null || [ ! -w "$PID_FILE" ]; then
-    PID_FILE="/run/shm/nginx.pid"
-    mkdir -p "$(dirname "$PID_FILE")"
+  CONF_PID=$(sed -n 's/^[[:space:]]*pid[[:space:]]\+\([^;]*\);.*/\1/p' /etc/nginx/nginx.conf 2>/dev/null | tr -d '"' | head -n1 || true)
+
+  if [ -n "$CONF_PID" ]; then
+    PID_FILE="$CONF_PID"
+    mkdir -p "$(dirname "$PID_FILE")" 2>/dev/null || true
     touch "$PID_FILE" 2>/dev/null || true
+    if [ -w "$PID_FILE" ] 2>/dev/null; then
+      info "Starting nginx (using pid from config): $PID_FILE"
+      nginx -e stderr
+    else
+      # If we can't write the config-specified pid, try to create a fallback
+      PID_FILE="/run/shm/nginx.pid"
+      mkdir -p "$(dirname "$PID_FILE")" 2>/dev/null || true
+      touch "$PID_FILE" 2>/dev/null || true
+      info "Config pid $CONF_PID not writable, starting nginx with fallback pid: $PID_FILE"
+      nginx -g "pid $PID_FILE;" -e stderr
+    fi
+  else
+    # No pid directive in config: use runtime-chosen pid file
+    PID_FILE="/run/nginx.pid"
+    if ! touch "$PID_FILE" 2>/dev/null || [ ! -w "$PID_FILE" ] 2>/dev/null; then
+      PID_FILE="/run/shm/nginx.pid"
+      mkdir -p "$(dirname "$PID_FILE")" 2>/dev/null || true
+      touch "$PID_FILE" 2>/dev/null || true
+    fi
+    info "Starting nginx with pid file: $PID_FILE"
+    nginx -g "pid $PID_FILE;" -e stderr
   fi
-  info "Starting nginx with pid file: $PID_FILE"
-  nginx -g "pid $PID_FILE;" -e stderr
 
   # Start websocket server — write logs to /run/shm (writable in non-root mode)
   mkdir -p /run/shm