diff options
| author | Olaf van der Spek <olafvdspek@gmail.com> | 2010-06-03 15:11:47 +0000 |
|---|---|---|
| committer | Olaf van der Spek <olafvdspek@gmail.com> | 2010-06-03 15:11:47 +0000 |
| commit | 181367da0745e79a20e47738bf8582b2b49f8700 (patch) | |
| tree | 575939f2ad825c06ff91cfdf31682e418da33b3d | |
| parent | 2362aee129f0c52e828fc535c94984dd4ec6560d (diff) | |
| download | lighttpd-181367da0745e79a20e47738bf8582b2b49f8700.tar.gz | |
Move access conf back into lighttpd.conf to ensure it's enabled by default.
| -rw-r--r-- | debian/conf-available/10-access.conf | 3 | ||||
| -rw-r--r-- | debian/lighttpd.conf | 19 | ||||
| -rw-r--r-- | debian/lighttpd.install | 1 |
3 files changed, 10 insertions, 13 deletions
diff --git a/debian/conf-available/10-access.conf b/debian/conf-available/10-access.conf deleted file mode 100644 index 01d42c2..0000000 --- a/debian/conf-available/10-access.conf +++ /dev/null @@ -1,3 +0,0 @@ -server.modules += ( "mod_access" ) - -url.access-deny = ( "~", ".inc" ) diff --git a/debian/lighttpd.conf b/debian/lighttpd.conf index 3a74f1c..9312aa0 100644 --- a/debian/lighttpd.conf +++ b/debian/lighttpd.conf @@ -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-file.names = ( "index.php", "index.html", "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 @@ index-file.names = ( "index.php", "index.html", # .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.username = "www-data" 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 diff --git a/debian/lighttpd.install b/debian/lighttpd.install index 8423757..17084ed 100644 --- a/debian/lighttpd.install +++ b/debian/lighttpd.install @@ -30,7 +30,6 @@ debian/tmp/usr/lib/lighttpd/mod_usertrack.so 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 |