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

[Olaf van der Spek]

Author: olafvdspek-guest
Date: 2010-06-03 15:11:47 +0000 (Thu, 03 Jun 2010)
New Revision: 466

Removed:
   lighttpd/trunk/debian/conf-available/10-access.conf
Modified:
   lighttpd/trunk/debian/lighttpd.conf
   lighttpd/trunk/debian/lighttpd.install
Log:
Move access conf back into lighttpd.conf to ensure it's enabled by default.


Deleted: lighttpd/trunk/debian/conf-available/10-access.conf
===================================================================
--- lighttpd/trunk/debian/conf-available/10-access.conf	2010-06-03 13:35:23 UTC (rev 465)
+++ lighttpd/trunk/debian/conf-available/10-access.conf	2010-06-03 15:11:47 UTC (rev 466)
@@ -1,3 +0,0 @@
-server.modules += ( "mod_access" )
-
-url.access-deny = ( "~", ".inc" )

Modified: lighttpd/trunk/debian/lighttpd.conf
===================================================================
--- lighttpd/trunk/debian/lighttpd.conf	2010-06-03 13:35:23 UTC (rev 465)
+++ lighttpd/trunk/debian/lighttpd.conf	2010-06-03 15:11:47 UTC (rev 466)
@@ -1,11 +1,12 @@
 server.modules = (
-            "mod_alias",
-            "mod_compress",
-#           "mod_rewrite",
-#           "mod_redirect",
-#           "mod_usertrack",
-#           "mod_flv_streaming",
-#           "mod_evasive"
+	"mod_access",
+	"mod_alias",
+	"mod_compress",
+#	"mod_rewrite",
+#	"mod_redirect",
+#	"mod_usertrack",
+#	"mod_flv_streaming",
+#	"mod_evasive"
 )
 
 server.document-root       = "/var/www"
@@ -16,6 +17,7 @@
                                "index.htm", "default.htm",
                                "index.lighttpd.html" )
 
+url.access-deny = ( "~", ".inc" )
 
 ## Use the "Content-Type" extended attribute to obtain mime type if possible
 # mimetype.use-xattr = "enable"
@@ -26,7 +28,6 @@
 # .php, .pl, .fcgi are most often handled by mod_fastcgi or mod_cgi
 static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
 
-
 ## Use ipv6 if available
 include_shell "/usr/share/lighttpd/use-ipv6.pl"
 
@@ -54,7 +55,7 @@
 server.groupname           = "www-data"
 
 compress.cache-dir          = "/var/cache/lighttpd/compress/"
-compress.filetype           = ("text/plain", "text/html", "application/x-javascript", "text/css")
+compress.filetype           = ( "application/x-javascript", "text/css", "text/html", "text/plain" )
 
 #### external configuration files
 ## mimetype mapping

Modified: lighttpd/trunk/debian/lighttpd.install
===================================================================
--- lighttpd/trunk/debian/lighttpd.install	2010-06-03 13:35:23 UTC (rev 465)
+++ lighttpd/trunk/debian/lighttpd.install	2010-06-03 15:11:47 UTC (rev 466)
@@ -30,7 +30,6 @@
 debian/lighttpd.conf                        /etc/lighttpd
 debian/conf-available/05-auth.conf          /etc/lighttpd/conf-available
 debian/conf-available/10-status.conf        /etc/lighttpd/conf-available
-debian/conf-available/10-access.conf        /etc/lighttpd/conf-available
 debian/conf-available/10-accesslog.conf     /etc/lighttpd/conf-available
 debian/conf-available/10-cgi.conf           /etc/lighttpd/conf-available
 debian/conf-available/10-fastcgi.conf       /etc/lighttpd/conf-available