diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2014-05-22 10:22:10 +0200 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2014-05-22 10:22:10 +0200 |
| commit | e4c6d9347f3ac7a43f6d452523f17c9d0174a3e6 (patch) | |
| tree | 3e93f87c1cfb45ea98e3fafc96931e4bd4fbf015 | |
| parent | Attempt to fix stop of apache with mod_perl in apache-2.2 as well (bug #503986) (diff) | |
| download | apache-e4c6d9347f3ac7a43f6d452523f17c9d0174a3e6.tar.gz apache-e4c6d9347f3ac7a43f6d452523f17c9d0174a3e6.tar.bz2 apache-e4c6d9347f3ac7a43f6d452523f17c9d0174a3e6.zip | |
Revert runtime dir location changes as /run only exists on Linux systems
| -rw-r--r-- | 2.2/init/apache2.confd | 2 | ||||
| -rwxr-xr-x | 2.2/init/apache2.initd | 2 | ||||
| -rw-r--r-- | 2.2/patches/config.layout | 2 | ||||
| -rw-r--r-- | 2.4/init/apache2.confd | 2 | ||||
| -rwxr-xr-x | 2.4/init/apache2.initd | 2 | ||||
| -rw-r--r-- | 2.4/patches/config.layout | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/2.2/init/apache2.confd b/2.2/init/apache2.confd index c520c20..4635201 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=/run/apache2.pid +#PIDFILE=/var/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 2f19cc4..46f0dbb 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:-/run/apache2.pid}" + PIDFILE="${PIDFILE:-/var/run/apache2.pid}" TIMEOUT=${TIMEOUT:-15} SERVERROOT="${SERVERROOT:-/usr/lib/apache2}" diff --git a/2.2/patches/config.layout b/2.2/patches/config.layout index f8debc4..83a4b0f 100644 --- a/2.2/patches/config.layout +++ b/2.2/patches/config.layout @@ -16,7 +16,7 @@ manualdir: /usr/share/doc/version/manual sysconfdir: /etc/apache2 localstatedir: /var - runtimedir: /run + runtimedir: /var/run logfiledir: /var/log/apache2 proxycachedir: /var/cache/apache2 </Layout> diff --git a/2.4/init/apache2.confd b/2.4/init/apache2.confd index c520c20..4635201 100644 --- a/2.4/init/apache2.confd +++ b/2.4/init/apache2.confd @@ -42,7 +42,7 @@ APACHE2_OPTS="-D DEFAULT_VHOST -D LANGUAGE -D INFO" # YOU HAVE BEEN WARNED. # PID file -#PIDFILE=/run/apache2.pid +#PIDFILE=/var/run/apache2.pid # timeout for startup/shutdown checks #TIMEOUT=10 diff --git a/2.4/init/apache2.initd b/2.4/init/apache2.initd index 71d4e02..f86a31e 100755 --- a/2.4/init/apache2.initd +++ b/2.4/init/apache2.initd @@ -34,7 +34,7 @@ checkconfd() { eerror "apache2.initd-baselayout-1 from /usr/share/doc/apache2-*/" fi - PIDFILE="${PIDFILE:-/run/apache2.pid}" + PIDFILE="${PIDFILE:-/var/run/apache2.pid}" TIMEOUT=${TIMEOUT:-15} SERVERROOT="${SERVERROOT:-/usr/lib/apache2}" diff --git a/2.4/patches/config.layout b/2.4/patches/config.layout index f8debc4..83a4b0f 100644 --- a/2.4/patches/config.layout +++ b/2.4/patches/config.layout @@ -16,7 +16,7 @@ manualdir: /usr/share/doc/version/manual sysconfdir: /etc/apache2 localstatedir: /var - runtimedir: /run + runtimedir: /var/run logfiledir: /var/log/apache2 proxycachedir: /var/cache/apache2 </Layout> |