diff options
| author | Valery Kartel <valery.kartel@gmail.com> | 2015-11-03 17:13:43 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-11-04 10:31:16 +0000 |
| commit | 5ae6da40775cc0c4262b77c1563ff637065a4c5d (patch) | |
| tree | 555334b6c9e7f9dd540e250ec20fd40f80f3437d /main/apache2/apache2.initd | |
| parent | e30fdf8f6a2860c012793feb0378b5ae476aabfe (diff) | |
| download | aports-5ae6da40775cc0c4262b77c1563ff637065a4c5d.tar.bz2 aports-5ae6da40775cc0c4262b77c1563ff637065a4c5d.tar.xz | |
main/apache2: upgrade to 2.4.17, +some cleanups
Diffstat (limited to 'main/apache2/apache2.initd')
| -rwxr-xr-x | main/apache2/apache2.initd | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/main/apache2/apache2.initd b/main/apache2/apache2.initd index 529d0eb37f..2975e7a4f5 100755 --- a/main/apache2/apache2.initd +++ b/main/apache2/apache2.initd @@ -1,6 +1,4 @@ #!/sbin/openrc-run -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 extra_commands="configdump configtest modules virtualhosts" extra_started_commands="fullstatus graceful gracefulstop reload" @@ -18,7 +16,7 @@ configtest() { } checkconfd() { - PIDFILE="${PIDFILE:-/var/run/apache2/httpd.pid}" + PIDFILE="${PIDFILE:-/run/apache2/httpd.pid}" TIMEOUT=${TIMEOUT:-10} SERVERROOT="${SERVERROOT:-/var/www}" @@ -55,8 +53,8 @@ checkconfig() { } start() { - checkpath --directory /var/run/apache2 checkconfig || return 1 + checkpath --directory $(dirname $PIDFILE) [ -f /var/log/apache2/ssl_scache ] && rm /var/log/apache2/ssl_scache @@ -125,7 +123,7 @@ fullstatus() { if ! service_started "${SVCNAME}"; then eerror "${SVCNAME} not started" elif ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then - eerror "lynx not found! you need to emerge www-client/lynx" + eerror "lynx not installed!" else ${LYNX} ${STATUSURL} fi @@ -145,7 +143,7 @@ configdump() { if ! service_started "${SVCNAME}"; then eerror "${SVCNAME} not started" elif ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then - eerror "lynx not found! you need to emerge www-client/lynx" + eerror "lynx not installed!" else echo "${HTTPD} started with '${HTTPD_OPTS}'" for i in config server list; do |