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

[Stefan Fritsch]

The following commit has been merged in the next branch:
commit e25bc7e9d17c212885f52244aacf47bbd875fa02
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Thu Feb 16 02:06:25 2012 +0100

    Move some config from the virt hosts to global

diff --git a/debian/config-dir/apache2.conf b/debian/config-dir/apache2.conf
index c6948da..cea69b5 100644
--- a/debian/config-dir/apache2.conf
+++ b/debian/config-dir/apache2.conf
@@ -104,6 +104,21 @@ ErrorLog ${APACHE_LOG_DIR}/error.log
 #
 LogLevel warn
 
+
+# XXX: Add comments
+# XXX: Maybe disable MultiViews by default?
+DocumentRoot /var/www
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+</Directory>
+<Directory /var/www/>
+    Options Indexes FollowSymLinks MultiViews
+    AllowOverride None
+    Require all granted
+</Directory>
+
+
 # Include module configuration:
 IncludeOptional mods-enabled/*.load
 IncludeOptional mods-enabled/*.conf
diff --git a/debian/config-dir/sites-available/default b/debian/config-dir/sites-available/default
index 8380072..0505029 100644
--- a/debian/config-dir/sites-available/default
+++ b/debian/config-dir/sites-available/default
@@ -1,17 +1,6 @@
 <VirtualHost *:80>
 	ServerAdmin webmaster at localhost
 
-	DocumentRoot /var/www
-	<Directory />
-		Options FollowSymLinks
-		AllowOverride None
-	</Directory>
-	<Directory /var/www/>
-		Options Indexes FollowSymLinks MultiViews
-		AllowOverride None
-		Require all granted
-	</Directory>
-
 	ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
 	<Directory "/usr/lib/cgi-bin">
 		AllowOverride None
diff --git a/debian/config-dir/sites-available/default-ssl b/debian/config-dir/sites-available/default-ssl
index b680e87..b7ab402 100644
--- a/debian/config-dir/sites-available/default-ssl
+++ b/debian/config-dir/sites-available/default-ssl
@@ -2,17 +2,6 @@
 <VirtualHost _default_:443>
 	ServerAdmin webmaster at localhost
 
-	DocumentRoot /var/www
-	<Directory />
-		Options FollowSymLinks
-		AllowOverride None
-	</Directory>
-	<Directory /var/www/>
-		Options Indexes FollowSymLinks MultiViews
-		AllowOverride None
-		Require all granted 
-	</Directory>
-
 	ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
 	<Directory "/usr/lib/cgi-bin">
 		AllowOverride None

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