[gentoo-commits] proj/apache:master commit in: 2.4/patches/, 2.2/init/, 2.2/patches/, 2.4/init/

[Lars Wendler]

commit:     e4c6d9347f3ac7a43f6d452523f17c9d0174a3e6
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu May 22 08:22:10 2014 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu May 22 08:22:10 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/apache.git;a=commit;h=e4c6d934

Revert runtime dir location changes as /run only exists on Linux systems

---
 2.2/init/apache2.confd    | 2 +-
 2.2/init/apache2.initd    | 2 +-
 2.2/patches/config.layout | 2 +-
 2.4/init/apache2.confd    | 2 +-
 2.4/init/apache2.initd    | 2 +-
 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>