Author SHA1 Message Date
Michael Weimann 2505f2be63 Removes less from docker 2019-06-11 20:28:27 +02:00
3 changed files with 1 additions and 21 deletions
-1
View File
@@ -5,7 +5,6 @@ fsfe.org
fsfe-website fsfe-website
lighttpd-fsfe*.log lighttpd-fsfe*.log
php-errors.log
# ignore everything in fsfe.org/ and status/ but keep the folders # ignore everything in fsfe.org/ and status/ but keep the folders
fsfe.org/* fsfe.org/*
-19
View File
@@ -1,19 +0,0 @@
#!/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"
+1 -1
View File
@@ -173,7 +173,7 @@ for ((i=1; i <= $numargs; i++)); do
echo_INFO "$HTTPD webserver already seems to be running." echo_INFO "$HTTPD webserver already seems to be running."
fi fi
elif [ "$HTTPD" == "lighttpd" ]; then elif [ "$HTTPD" == "lighttpd" ]; then
if [ ! $(pgrep -f "lighttpd.*${HTTPD_conf}") ]; then # lighttpd if [ ! $(pgrep lighttpd) ]; then # lighttpd
echo_INFO "Starting $HTTPD webserver" echo_INFO "Starting $HTTPD webserver"
/usr/sbin/lighttpd -f "$HTTPD_conf" /usr/sbin/lighttpd -f "$HTTPD_conf"
else else