diff --git a/rootfs/usr/local/etc/docker/functions/entrypoint.sh b/rootfs/usr/local/etc/docker/functions/entrypoint.sh index 381a2ee..c49cd70 100644 --- a/rootfs/usr/local/etc/docker/functions/entrypoint.sh +++ b/rootfs/usr/local/etc/docker/functions/entrypoint.sh @@ -7,7 +7,7 @@ __cd() { [ -d "$1" ] && builtin cd "$1" || return 1; } __netstat() { [ -f "$(type -P netstat)" ] && netstat "$@" || return 10; } __curl() { curl -q -sfI --max-time 3 -k -o /dev/null "$@" &>/dev/null || return 10; } __find() { find "$1" -mindepth 1 -type ${2:-f,d} 2>/dev/null | grep '^' || return 10; } -__no_exit() { exec /bin/sh -c "trap : TERM INT; (while true; do tail -f /data/logs/entrypoint.log /data/logs/*/* 2>/dev/null||sleep 20; done) & wait"; } +__no_exit() { exec /bin/sh -c "trap : TERM INT; (while true; do tail -f /data/logs/entrypoint.log /data/logs/*/*log 2>/dev/null||sleep 20; done) & wait"; } __pcheck() { [ -n "$(which pgrep 2>/dev/null)" ] && pgrep -o "$1" &>/dev/null || return 10; } __ps() { [ -f "$(type -P ps)" ] && ps "$@" 2>/dev/null | grep -Fw " ${1:-$GEN_SCRIPT_REPLACE_APPNAME}" || return 10; } __pgrep() { __pcheck "${1:-GEN_SCRIPT_REPLACE_APPNAME}" || __ps "${1:-$GEN_SCRIPT_REPLACE_APPNAME}" | grep -qv ' grep' || return 10; } @@ -109,7 +109,7 @@ __init_apache() { local etc_dir="" conf_dir="" conf_dir="" www_dir="" apache_bin="" etc_dir="/etc/${1:-apache2}" conf_dir="/config/${1:-apache2}" - www_dir="${WWW_ROOT_DIR:-/data/htdocs/www}" + www_dir="${WWW_ROOT_DIR:-/data/htdocs}" apache_bin="$(type -P 'httpd' || type -P 'apache2')" # return 0