[pkg-lighttpd] r429 - in lighttpd/trunk/debian: . conf-available

[Olaf van der Spek]

Author: olafvdspek-guest
Date: 2010-05-20 17:40:34 +0000 (Thu, 20 May 2010)
New Revision: 429

Added:
   lighttpd/trunk/debian/conf-available/90-debian-doc.conf
Modified:
   lighttpd/trunk/debian/conf-available/10-cgi.conf
   lighttpd/trunk/debian/lighttpd.conf
   lighttpd/trunk/debian/lighttpd.install
Log:
move debian doc handling into it's own file


Modified: lighttpd/trunk/debian/conf-available/10-cgi.conf
===================================================================
--- lighttpd/trunk/debian/conf-available/10-cgi.conf	2010-05-18 13:18:12 UTC (rev 428)
+++ lighttpd/trunk/debian/conf-available/10-cgi.conf	2010-05-20 17:40:34 UTC (rev 429)
@@ -6,13 +6,6 @@
 
 server.modules  += ( "mod_cgi" )
 
-$HTTP["remoteip"] =~ "127.0.0.1" {
-	alias.url += ( "/cgi-bin/" => "/usr/lib/cgi-bin/" )
-	$HTTP["url"] =~ "^/cgi-bin/" {
-		cgi.assign = ( "" => "" )
-	}
-}
-
 $HTTP["url"] =~ "^/cgi-bin/" {
 	cgi.assign = ( "" => "" )
 }

Added: lighttpd/trunk/debian/conf-available/90-debian-doc.conf
===================================================================
--- lighttpd/trunk/debian/conf-available/90-debian-doc.conf	                        (rev 0)
+++ lighttpd/trunk/debian/conf-available/90-debian-doc.conf	2010-05-20 17:40:34 UTC (rev 429)
@@ -0,0 +1,17 @@
+#### handle Debian Policy Manual, Section 11.5. urls
+## by default allow them only from localhost
+## (This must come last due to #445459)
+## Note: =~ "127.0.0.1" works with ipv6 enabled, whereas == "127.0.0.1" doesn't
+$HTTP["remoteip"] =~ "127.0.0.1" {
+        alias.url += (
+		"/cgi-bin/" => "/usr/lib/cgi-bin/",
+                "/doc/" => "/usr/share/doc/",
+                "/images/" => "/usr/share/images/"
+        )
+        $HTTP["url"] =~ "^/doc/|^/images/" {
+                dir-listing.activate = "enable"
+        }
+        $HTTP["url"] =~ "^/cgi-bin/" {
+                cgi.assign = ( "" => "" )
+        }
+}

Modified: lighttpd/trunk/debian/lighttpd.conf
===================================================================
--- lighttpd/trunk/debian/lighttpd.conf	2010-05-18 13:18:12 UTC (rev 428)
+++ lighttpd/trunk/debian/lighttpd.conf	2010-05-20 17:40:34 UTC (rev 429)
@@ -151,17 +151,3 @@
 ## read /etc/lighttpd/conf-available/README first
 include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
 
-#### handle Debian Policy Manual, Section 11.5. urls
-## by default allow them only from localhost
-## (This must come last due to #445459)
-## Note: =~ "127.0.0.1" works with ipv6 enabled, whereas == "127.0.0.1" doesn't
-$HTTP["remoteip"] =~ "127.0.0.1" {
-	alias.url += (
-		"/doc/" => "/usr/share/doc/",
-		"/images/" => "/usr/share/images/"
-	)
-	$HTTP["url"] =~ "^/doc/|^/images/" {
-		dir-listing.activate = "enable"
-	}
-}
-

Modified: lighttpd/trunk/debian/lighttpd.install
===================================================================
--- lighttpd/trunk/debian/lighttpd.install	2010-05-18 13:18:12 UTC (rev 428)
+++ lighttpd/trunk/debian/lighttpd.install	2010-05-20 17:40:34 UTC (rev 429)
@@ -38,6 +38,7 @@
 debian/conf-available/10-ssi.conf           /etc/lighttpd/conf-available
 debian/conf-available/10-ssl.conf           /etc/lighttpd/conf-available
 debian/conf-available/10-userdir.conf       /etc/lighttpd/conf-available
+debian/conf-available/90-debian-doc.conf    /etc/lighttpd/conf-available
 debian/conf-available/README                /etc/lighttpd/conf-available
 debian/create-mime.assign.pl                /usr/share/lighttpd/
 debian/include-conf-enabled.pl              /usr/share/lighttpd/