Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/apache:master commit in: 2.2/init/
Date: Sat, 09 Nov 2013 17:09:54
Message-Id: 1384016912.dc525fb7d64b5c537fac93a1fca9ff6bdcef2981.polynomial-c@gentoo
1 commit: dc525fb7d64b5c537fac93a1fca9ff6bdcef2981
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 9 17:08:32 2013 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 9 17:08:32 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/apache.git;a=commit;h=dc525fb7
7
8 Fixed location of pidfile.
9
10 ---
11 2.2/init/apache2.confd | 2 +-
12 2.2/init/apache2.initd | 2 +-
13 2 files changed, 2 insertions(+), 2 deletions(-)
14
15 diff --git a/2.2/init/apache2.confd b/2.2/init/apache2.confd
16 index 4635201..c520c20 100644
17 --- a/2.2/init/apache2.confd
18 +++ b/2.2/init/apache2.confd
19 @@ -42,7 +42,7 @@ APACHE2_OPTS="-D DEFAULT_VHOST -D LANGUAGE -D INFO"
20 # YOU HAVE BEEN WARNED.
21
22 # PID file
23 -#PIDFILE=/var/run/apache2.pid
24 +#PIDFILE=/run/apache2.pid
25
26 # timeout for startup/shutdown checks
27 #TIMEOUT=10
28
29 diff --git a/2.2/init/apache2.initd b/2.2/init/apache2.initd
30 index 8cbb030..002e278 100755
31 --- a/2.2/init/apache2.initd
32 +++ b/2.2/init/apache2.initd
33 @@ -34,7 +34,7 @@ checkconfd() {
34 eerror "apache2.initd-baselayout-1 from /usr/share/doc/apache2-*/"
35 fi
36
37 - PIDFILE="${PIDFILE:-/var/run/apache2.pid}"
38 + PIDFILE="${PIDFILE:-/run/apache2.pid}"
39 TIMEOUT=${TIMEOUT:-15}
40
41 SERVERROOT="${SERVERROOT:-/usr/lib/apache2}"