| 1 |
commit: e4c6d9347f3ac7a43f6d452523f17c9d0174a3e6 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 22 08:22:10 2014 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 22 08:22:10 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/apache.git;a=commit;h=e4c6d934 |
| 7 |
|
| 8 |
Revert runtime dir location changes as /run only exists on Linux systems |
| 9 |
|
| 10 |
--- |
| 11 |
2.2/init/apache2.confd | 2 +- |
| 12 |
2.2/init/apache2.initd | 2 +- |
| 13 |
2.2/patches/config.layout | 2 +- |
| 14 |
2.4/init/apache2.confd | 2 +- |
| 15 |
2.4/init/apache2.initd | 2 +- |
| 16 |
2.4/patches/config.layout | 2 +- |
| 17 |
6 files changed, 6 insertions(+), 6 deletions(-) |
| 18 |
|
| 19 |
diff --git a/2.2/init/apache2.confd b/2.2/init/apache2.confd |
| 20 |
index c520c20..4635201 100644 |
| 21 |
--- a/2.2/init/apache2.confd |
| 22 |
+++ b/2.2/init/apache2.confd |
| 23 |
@@ -42,7 +42,7 @@ APACHE2_OPTS="-D DEFAULT_VHOST -D LANGUAGE -D INFO" |
| 24 |
# YOU HAVE BEEN WARNED. |
| 25 |
|
| 26 |
# PID file |
| 27 |
-#PIDFILE=/run/apache2.pid |
| 28 |
+#PIDFILE=/var/run/apache2.pid |
| 29 |
|
| 30 |
# timeout for startup/shutdown checks |
| 31 |
#TIMEOUT=10 |
| 32 |
|
| 33 |
diff --git a/2.2/init/apache2.initd b/2.2/init/apache2.initd |
| 34 |
index 2f19cc4..46f0dbb 100755 |
| 35 |
--- a/2.2/init/apache2.initd |
| 36 |
+++ b/2.2/init/apache2.initd |
| 37 |
@@ -34,7 +34,7 @@ checkconfd() { |
| 38 |
eerror "apache2.initd-baselayout-1 from /usr/share/doc/apache2-*/" |
| 39 |
fi |
| 40 |
|
| 41 |
- PIDFILE="${PIDFILE:-/run/apache2.pid}" |
| 42 |
+ PIDFILE="${PIDFILE:-/var/run/apache2.pid}" |
| 43 |
TIMEOUT=${TIMEOUT:-15} |
| 44 |
|
| 45 |
SERVERROOT="${SERVERROOT:-/usr/lib/apache2}" |
| 46 |
|
| 47 |
diff --git a/2.2/patches/config.layout b/2.2/patches/config.layout |
| 48 |
index f8debc4..83a4b0f 100644 |
| 49 |
--- a/2.2/patches/config.layout |
| 50 |
+++ b/2.2/patches/config.layout |
| 51 |
@@ -16,7 +16,7 @@ |
| 52 |
manualdir: /usr/share/doc/version/manual |
| 53 |
sysconfdir: /etc/apache2 |
| 54 |
localstatedir: /var |
| 55 |
- runtimedir: /run |
| 56 |
+ runtimedir: /var/run |
| 57 |
logfiledir: /var/log/apache2 |
| 58 |
proxycachedir: /var/cache/apache2 |
| 59 |
</Layout> |
| 60 |
|
| 61 |
diff --git a/2.4/init/apache2.confd b/2.4/init/apache2.confd |
| 62 |
index c520c20..4635201 100644 |
| 63 |
--- a/2.4/init/apache2.confd |
| 64 |
+++ b/2.4/init/apache2.confd |
| 65 |
@@ -42,7 +42,7 @@ APACHE2_OPTS="-D DEFAULT_VHOST -D LANGUAGE -D INFO" |
| 66 |
# YOU HAVE BEEN WARNED. |
| 67 |
|
| 68 |
# PID file |
| 69 |
-#PIDFILE=/run/apache2.pid |
| 70 |
+#PIDFILE=/var/run/apache2.pid |
| 71 |
|
| 72 |
# timeout for startup/shutdown checks |
| 73 |
#TIMEOUT=10 |
| 74 |
|
| 75 |
diff --git a/2.4/init/apache2.initd b/2.4/init/apache2.initd |
| 76 |
index 71d4e02..f86a31e 100755 |
| 77 |
--- a/2.4/init/apache2.initd |
| 78 |
+++ b/2.4/init/apache2.initd |
| 79 |
@@ -34,7 +34,7 @@ checkconfd() { |
| 80 |
eerror "apache2.initd-baselayout-1 from /usr/share/doc/apache2-*/" |
| 81 |
fi |
| 82 |
|
| 83 |
- PIDFILE="${PIDFILE:-/run/apache2.pid}" |
| 84 |
+ PIDFILE="${PIDFILE:-/var/run/apache2.pid}" |
| 85 |
TIMEOUT=${TIMEOUT:-15} |
| 86 |
|
| 87 |
SERVERROOT="${SERVERROOT:-/usr/lib/apache2}" |
| 88 |
|
| 89 |
diff --git a/2.4/patches/config.layout b/2.4/patches/config.layout |
| 90 |
index f8debc4..83a4b0f 100644 |
| 91 |
--- a/2.4/patches/config.layout |
| 92 |
+++ b/2.4/patches/config.layout |
| 93 |
@@ -16,7 +16,7 @@ |
| 94 |
manualdir: /usr/share/doc/version/manual |
| 95 |
sysconfdir: /etc/apache2 |
| 96 |
localstatedir: /var |
| 97 |
- runtimedir: /run |
| 98 |
+ runtimedir: /var/run |
| 99 |
logfiledir: /var/log/apache2 |
| 100 |
proxycachedir: /var/cache/apache2 |
| 101 |
</Layout> |
Archives