diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2013-11-09 18:08:32 +0100 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2013-11-09 18:08:32 +0100 |
commit | dc525fb7d64b5c537fac93a1fca9ff6bdcef2981 (patch) | |
tree | 59fc1b51f388e1fed5fcdcda6d52d8e8d0d1250d | |
parent | apache2.initd: Init script now returns as failed when apache fails to start. (diff) | |
download | apache-dc525fb7d64b5c537fac93a1fca9ff6bdcef2981.tar.gz apache-dc525fb7d64b5c537fac93a1fca9ff6bdcef2981.tar.bz2 apache-dc525fb7d64b5c537fac93a1fca9ff6bdcef2981.zip |
Fixed location of pidfile.
-rw-r--r-- | 2.2/init/apache2.confd | 2 | ||||
-rwxr-xr-x | 2.2/init/apache2.initd | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/2.2/init/apache2.confd b/2.2/init/apache2.confd index 4635201..c520c20 100644 --- a/2.2/init/apache2.confd +++ b/2.2/init/apache2.confd @@ -42,7 +42,7 @@ APACHE2_OPTS="-D DEFAULT_VHOST -D LANGUAGE -D INFO" # YOU HAVE BEEN WARNED. # PID file -#PIDFILE=/var/run/apache2.pid +#PIDFILE=/run/apache2.pid # timeout for startup/shutdown checks #TIMEOUT=10 diff --git a/2.2/init/apache2.initd b/2.2/init/apache2.initd index 8cbb030..002e278 100755 --- a/2.2/init/apache2.initd +++ b/2.2/init/apache2.initd @@ -34,7 +34,7 @@ checkconfd() { eerror "apache2.initd-baselayout-1 from /usr/share/doc/apache2-*/" fi - PIDFILE="${PIDFILE:-/var/run/apache2.pid}" + PIDFILE="${PIDFILE:-/run/apache2.pid}" TIMEOUT=${TIMEOUT:-15} SERVERROOT="${SERVERROOT:-/usr/lib/apache2}" |