better define which lighttpd instance to look for

.gitignore

@@ -5,6 +5,7 @@ fsfe.org
 fsfe-website
 
 lighttpd-fsfe*.log
+php-errors.log
 
 # ignore everything in fsfe.org/ and status/ but keep the folders
 fsfe.org/*

fsfe-build.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+# =============================================================================
+# Start a build of the fsfe-website checkout in the current working directory
+# =============================================================================
+# SPDX-FileCopyrightText: © 2020 Reinhard Müller <reinhard@fsfe.org>
+# SPDX-License-Identifier: WTFPL
+# =============================================================================
+
+set -e
+
+# Find out fsfe-website directory
+gitdir="$(git rev-parse --show-toplevel)"
+
+# Find out fsfe-local-build directory
+builddir="$(dirname "$(readlink -f "$0")")"
+
+# Start the build
+echo "Building from ${gitdir} into ${builddir}/fsfe.org"
+"${gitdir}/build/build_main.sh" build_run "${builddir}/fsfe.org" --statusdir "${builddir}/status"

fsfe-preview.sh

@@ -173,7 +173,7 @@ for ((i=1; i <= $numargs; i++)); do
       echo_INFO "$HTTPD webserver already seems to be running."
     fi
   elif [ "$HTTPD" == "lighttpd" ]; then
-    if [ ! $(pgrep lighttpd) ]; then   # lighttpd
+    if [ ! $(pgrep -f "lighttpd.*${HTTPD_conf}") ]; then   # lighttpd
       echo_INFO "Starting $HTTPD webserver"
       /usr/sbin/lighttpd -f "$HTTPD_conf"
     else