| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Tue, 18 Nov 2014 04:33:14 -0800 | |
| changeset 2222 | ad929ef7a9df |
| parent 278 | 77b380ba9d84 |
| permissions | -rw-r--r-- |
|
2222
ad929ef7a9df
20051239 Upgrade Apache Web Server to version 2.2.29
Petr Sumbera <petr.sumbera@oracle.com>
parents:
278
diff
changeset
|
1 |
Patch origin: in-house |
|
ad929ef7a9df
20051239 Upgrade Apache Web Server to version 2.2.29
Petr Sumbera <petr.sumbera@oracle.com>
parents:
278
diff
changeset
|
2 |
Patch status: Solaris-specific; not suitable for upstream |
|
ad929ef7a9df
20051239 Upgrade Apache Web Server to version 2.2.29
Petr Sumbera <petr.sumbera@oracle.com>
parents:
278
diff
changeset
|
3 |
|
|
ad929ef7a9df
20051239 Upgrade Apache Web Server to version 2.2.29
Petr Sumbera <petr.sumbera@oracle.com>
parents:
278
diff
changeset
|
4 |
--- config.layout |
|
ad929ef7a9df
20051239 Upgrade Apache Web Server to version 2.2.29
Petr Sumbera <petr.sumbera@oracle.com>
parents:
278
diff
changeset
|
5 |
+++ config.layout |
|
ad929ef7a9df
20051239 Upgrade Apache Web Server to version 2.2.29
Petr Sumbera <petr.sumbera@oracle.com>
parents:
278
diff
changeset
|
6 |
@@ -346,3 +346,73 @@ |
|
ad929ef7a9df
20051239 Upgrade Apache Web Server to version 2.2.29
Petr Sumbera <petr.sumbera@oracle.com>
parents:
278
diff
changeset
|
7 |
logfiledir: ${localstatedir}/logs
|
|
ad929ef7a9df
20051239 Upgrade Apache Web Server to version 2.2.29
Petr Sumbera <petr.sumbera@oracle.com>
parents:
278
diff
changeset
|
8 |
proxycachedir: ${localstatedir}/proxy
|
|
278
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
</Layout> |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
+ |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
+# Solaris Layout for Apache 2 |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
+<Layout Solaris-Apache2> |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
+ prefix: /usr/apache2/2.2 |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
+ exec_prefix: ${prefix}
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
+ bindir: ${exec_prefix}/bin
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
+ sbindir: ${exec_prefix}/bin
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
+ libdir: ${exec_prefix}/lib
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
+ libexecdir: ${exec_prefix}/libexec
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
+ mandir: ${exec_prefix}/man
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
+ sysconfdir: /etc/apache2/2.2 |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
+ datadir: /var/apache2/2.2 |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
+ installbuilddir: ${prefix}/build
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
+ errordir: ${datadir}/error
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
+ iconsdir: ${datadir}/icons
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
25 |
+ htdocsdir: ${datadir}/htdocs
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
26 |
+ manualdir: ${prefix}/manual
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
27 |
+ cgidir: ${datadir}/cgi-bin
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
28 |
+ includedir: ${exec_prefix}/include
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
29 |
+ localstatedir: ${prefix}
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
30 |
+ runtimedir: /var/run/apache2/2.2 |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
31 |
+ logfiledir: ${datadir}/logs
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
32 |
+ proxycachedir: ${datadir}/proxy
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
33 |
+</Layout> |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
34 |
+ |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
35 |
+<Layout Solaris-Apache2-amd64> |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
36 |
+ prefix: /usr/apache2/2.2 |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
37 |
+ exec_prefix: ${prefix}
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
38 |
+ bindir: ${exec_prefix}/bin/amd64
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
39 |
+ sbindir: ${exec_prefix}/bin/amd64
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
40 |
+ libdir: ${exec_prefix}/lib/amd64
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
41 |
+ libexecdir: ${exec_prefix}/libexec/amd64
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
42 |
+ mandir: ${exec_prefix}/man
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
43 |
+ sysconfdir: /etc/apache2/2.2 |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
44 |
+ datadir: /var/apache2/2.2 |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
45 |
+ installbuilddir: ${prefix}/build/amd64
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
46 |
+ errordir: ${datadir}/error
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
47 |
+ iconsdir: ${datadir}/icons
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
48 |
+ htdocsdir: ${datadir}/htdocs
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
49 |
+ manualdir: ${prefix}/manual
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
50 |
+ cgidir: ${datadir}/cgi-bin
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
51 |
+ includedir: ${exec_prefix}/include
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
52 |
+ localstatedir: ${prefix}
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
53 |
+ runtimedir: /var/run/apache2/2.2 |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
54 |
+ logfiledir: ${datadir}/logs
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
55 |
+ proxycachedir: ${datadir}/proxy
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
56 |
+</Layout> |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
57 |
+ |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
58 |
+<Layout Solaris-Apache2-sparcv9> |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
59 |
+ prefix: /usr/apache2/2.2 |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
60 |
+ exec_prefix: ${prefix}
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
61 |
+ bindir: ${exec_prefix}/bin/sparcv9
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
62 |
+ sbindir: ${exec_prefix}/bin/sparcv9
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
63 |
+ libdir: ${exec_prefix}/lib/sparcv9
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
64 |
+ libexecdir: ${exec_prefix}/libexec/sparcv9
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
65 |
+ mandir: ${exec_prefix}/man
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
66 |
+ sysconfdir: /etc/apache2/2.2 |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
67 |
+ datadir: /var/apache2/2.2 |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
68 |
+ installbuilddir: ${prefix}/build/sparcv9
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
69 |
+ errordir: ${datadir}/error
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
70 |
+ iconsdir: ${datadir}/icons
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
71 |
+ htdocsdir: ${datadir}/htdocs
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
72 |
+ manualdir: ${prefix}/manual
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
73 |
+ cgidir: ${datadir}/cgi-bin
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
74 |
+ includedir: ${exec_prefix}/include
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
75 |
+ localstatedir: ${prefix}
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
76 |
+ runtimedir: /var/run/apache2/2.2 |
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
77 |
+ logfiledir: ${datadir}/logs
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
78 |
+ proxycachedir: ${datadir}/proxy
|
|
77b380ba9d84
7045614 Move Apache Web server to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
79 |
+</Layout> |