[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. 47f34b5955626a03b3236ee4fd81c4b8fb755542

[Stefan Fritsch]

The following commit has been merged in the next branch:
commit 47f34b5955626a03b3236ee4fd81c4b8fb755542
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat Apr 14 23:41:36 2012 +0200

    Remove DocumentRoot from apache2.conf again
    
    instead, change the compiled-in default to /var/www

diff --git a/debian/config-dir/apache2.conf b/debian/config-dir/apache2.conf
index 3c9b2a2..b0e2a80 100644
--- a/debian/config-dir/apache2.conf
+++ b/debian/config-dir/apache2.conf
@@ -150,9 +150,6 @@ Include ports.conf
 # not allow access to the root filesystem except of /usr/share and
 # /var/www. The former is used by web applications packaged in Debian,
 # the latter may be used for local directories served by the web server.
-
-DocumentRoot /var/www
-
 <Directory />
     Options FollowSymLinks
     AllowOverride None
diff --git a/debian/patches/fhs_compliance.patch b/debian/patches/fhs_compliance.patch
index 46f0934..77cdb83 100644
--- a/debian/patches/fhs_compliance.patch
+++ b/debian/patches/fhs_compliance.patch
@@ -57,3 +57,16 @@ Index: apache2/include/ap_config_layout.h.in
 +#define DEFAULT_PIDLOG "/var/run/apache2.pid"
  
  #endif /* AP_CONFIG_LAYOUT_H */
+Index: apache2/include/httpd.h
+===================================================================
+--- apache2.orig/include/httpd.h
++++ apache2/include/httpd.h
+@@ -109,7 +109,7 @@
+ #define DOCUMENT_LOCATION  HTTPD_ROOT "/docs"
+ #else
+ /* Set default for non OS/2 file system */
+-#define DOCUMENT_LOCATION  HTTPD_ROOT "/htdocs"
++#define DOCUMENT_LOCATION  "/var/www"
+ #endif
+ #endif /* DOCUMENT_LOCATION */
+ 

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)