[Pkg-apache-commits] r1139 - in /trunk/apache2: changelog config-dir/apache2.conf patches/010_fhs_compliance
sf at alioth.debian.org
sf at alioth.debian.org
Sun Feb 7 00:11:17 UTC 2010
Author: sf
Date: Sun Feb 7 00:11:12 2010
New Revision: 1139
URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1139
Log:
Set default compiled-in ServerRoot to /etc/apache2 and make paths in
apache2.conf relative to ServerRoot.
Added:
trunk/apache2/patches/010_fhs_compliance (with props)
Modified:
trunk/apache2/changelog
trunk/apache2/config-dir/apache2.conf
Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1139&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Sun Feb 7 00:11:12 2010
@@ -1,6 +1,8 @@
apache2 (2.2.14-6) UNRELEASED; urgency=low
* Move ab and logresolve from /usr/sbin to /usr/bin. Closes: #351450, #564061
+ * Set default compiled-in ServerRoot to /etc/apache2 and make paths in
+ apache2.conf relative to ServerRoot.
* Fix symlinks in apache2-dbg package. Closes: #567076
* Fix mod_cache CacheIgnoreURLSessionIdentifiers handling. Closes: #556383
* Add new init script action graceful-stop (LP: #456381)
Modified: trunk/apache2/config-dir/apache2.conf
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/config-dir/apache2.conf?rev=1139&op=diff
==============================================================================
--- trunk/apache2/config-dir/apache2.conf (original)
+++ trunk/apache2/config-dir/apache2.conf Sun Feb 7 00:11:12 2010
@@ -24,9 +24,9 @@
# Configuration and logfile names: If the filenames you specify for many
# of the server's control files begin with "/" (or "drive:/" for Win32), the
# server will use that explicit path. If the filenames do *not* begin
-# with "/", the value of ServerRoot is prepended -- so "/var/log/apache2/foo.log"
-# with ServerRoot set to "" will be interpreted by the
-# server as "//var/log/apache2/foo.log".
+# with "/", the value of ServerRoot is prepended -- so "foo.log"
+# with ServerRoot set to "/etc/apache2" will be interpreted by the
+# server as "/etc/apache2/foo.log".
#
### Section 1: Global Environment
@@ -42,12 +42,12 @@
#
# NOTE! If you intend to place this on an NFS (or otherwise network)
# mounted filesystem then please read the LockFile documentation (available
-# at <URL:http://httpd.apache.org/docs-2.1/mod/mpm_common.html#lockfile>);
+# at <URL:http://httpd.apache.org/docs/2.2/mod/mpm_common.html#lockfile>);
# you will save yourself a lot of trouble.
#
# Do NOT add a slash at the end of the directory path.
#
-ServerRoot "/etc/apache2"
+#ServerRoot "/etc/apache2"
#
# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
@@ -200,14 +200,14 @@
LogLevel warn
# Include module configuration:
-Include /etc/apache2/mods-enabled/*.load
-Include /etc/apache2/mods-enabled/*.conf
+Include mods-enabled/*.load
+Include mods-enabled/*.conf
# Include all the user configurations:
-Include /etc/apache2/httpd.conf
+Include httpd.conf
# Include ports listing
-Include /etc/apache2/ports.conf
+Include ports.conf
#
# The following directives define some format nicknames for use with
@@ -229,7 +229,7 @@
# see README.Debian for details.
# Include generic snippets of statements
-Include /etc/apache2/conf.d/
+Include conf.d/
# Include the virtual host configurations:
-Include /etc/apache2/sites-enabled/
+Include sites-enabled/
Added: trunk/apache2/patches/010_fhs_compliance
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/patches/010_fhs_compliance?rev=1139&op=file
==============================================================================
--- trunk/apache2/patches/010_fhs_compliance (added)
+++ trunk/apache2/patches/010_fhs_compliance Sun Feb 7 00:11:12 2010
@@ -1,0 +1,77 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 010_more_fhs_compliance by Adam Conrad <adconrad at 0c3.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix up FHS file locations for apache2 droppings.
+
+ at DPATCH@
+diff -urNad trunk~/config.layout trunk/config.layout
+--- trunk~/config.layout 2010-02-07 01:01:14.000000000 +0100
++++ trunk/config.layout 2010-02-07 01:01:42.858033215 +0100
+@@ -314,11 +314,11 @@
+ manualdir: ${htdocsdir}/manual
+ cgidir: ${prefix}/usr/lib/cgi-bin
+ includedir: ${exec_prefix}/include/apache2
+- localstatedir: ${prefix}/var/run
+- runtimedir: ${prefix}/var/run
++ localstatedir: ${prefix}/var/lock/apache2
++ runtimedir: ${prefix}/var/run/apache2
+ logfiledir: ${prefix}/var/log/apache2
+ proxycachedir: ${prefix}/var/cache/apache2/proxy
+ infodir: ${exec_prefix}/share/info
+- installbuilddir: ${prefix}/etc/apache2/build
++ installbuilddir: ${prefix}/usr/share/apache2/build
+ errordir: ${datadir}/error
+ </Layout>
+diff -urNad trunk~/configure trunk/configure
+--- trunk~/configure 2010-02-07 01:01:14.000000000 +0100
++++ trunk/configure 2010-02-07 01:01:55.166032804 +0100
+@@ -18881,17 +18881,17 @@
+
+
+ cat >>confdefs.h <<_ACEOF
+-#define HTTPD_ROOT "${ap_prefix}"
++#define HTTPD_ROOT "/etc/apache2"
+ _ACEOF
+
+
+ cat >>confdefs.h <<_ACEOF
+-#define SERVER_CONFIG_FILE "${rel_sysconfdir}/${progname}.conf"
++#define SERVER_CONFIG_FILE "${progname}.conf"
+ _ACEOF
+
+
+ cat >>confdefs.h <<_ACEOF
+-#define AP_TYPES_CONFIG_FILE "${rel_sysconfdir}/mime.types"
++#define AP_TYPES_CONFIG_FILE "mime.types"
+ _ACEOF
+
+
+diff -urNad trunk~/configure.in trunk/configure.in
+--- trunk~/configure.in 2010-02-07 01:01:14.000000000 +0100
++++ trunk/configure.in 2010-02-07 01:01:42.866058396 +0100
+@@ -649,11 +649,11 @@
+ echo $MODLIST | $AWK -f $srcdir/build/build-modules-c.awk > modules.c
+
+ APR_EXPAND_VAR(ap_prefix, $prefix)
+-AC_DEFINE_UNQUOTED(HTTPD_ROOT, "${ap_prefix}",
++AC_DEFINE_UNQUOTED(HTTPD_ROOT, "/etc/apache2",
+ [Root directory of the Apache install area])
+-AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf",
++AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${progname}.conf",
+ [Location of the config file, relative to the Apache root directory])
+-AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types",
++AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "mime.types",
+ [Location of the MIME types config file, relative to the Apache root directory])
+ AC_DEFINE_UNQUOTED(APACHE_MPM_DIR, "$MPM_DIR",
+ [Location of the source for the current MPM])
+diff -urNad trunk~/include/ap_config_layout.h.in trunk/include/ap_config_layout.h.in
+--- trunk~/include/ap_config_layout.h.in 2010-02-07 01:01:14.000000000 +0100
++++ trunk/include/ap_config_layout.h.in 2010-02-07 01:01:42.866058396 +0100
+@@ -60,5 +60,6 @@
+ #define DEFAULT_REL_LOGFILEDIR "@rel_logfiledir@"
+ #define DEFAULT_EXP_PROXYCACHEDIR "@exp_proxycachedir@"
+ #define DEFAULT_REL_PROXYCACHEDIR "@rel_proxycachedir@"
++#define DEFAULT_PIDLOG "/var/run/apache2.pid"
+
+ #endif /* AP_CONFIG_LAYOUT_H */
Propchange: trunk/apache2/patches/010_fhs_compliance
------------------------------------------------------------------------------
svn:mergeinfo =
More information about the Pkg-apache-commits
mailing list