diff --git a/advanced/lighttpd.conf.debian b/advanced/lighttpd.conf.debian index c4e15f4b..6020dfd8 100644 --- a/advanced/lighttpd.conf.debian +++ b/advanced/lighttpd.conf.debian @@ -16,14 +16,14 @@ ############################################################################### server.modules = ( - "mod_access", - "mod_accesslog", - "mod_auth", - "mod_expire", - "mod_compress", - "mod_redirect", - "mod_setenv", - "mod_rewrite" + "mod_access", + "mod_accesslog", + "mod_auth", + "mod_expire", + "mod_compress", + "mod_redirect", + "mod_setenv", + "mod_rewrite" ) server.document-root = "/var/www/html" @@ -41,18 +41,45 @@ index-file.names = ( "index.php", "index.html", "index.lighttpd.html" url.access-deny = ( "~", ".inc", ".md", ".yml", ".ini" ) static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" ) -compress.cache-dir = "/var/cache/lighttpd/compress/" -compress.filetype = ( "application/javascript", "text/css", "text/html", "text/plain" ) +compress.cache-dir = "/var/cache/lighttpd/compress/" +compress.filetype = ( + "application/json", + "application/vnd.ms-fontobject", + "application/xml", + "font/eot", + "font/opentype", + "font/otf", + "font/ttf", + "image/bmp", + "image/svg+xml", + "image/vnd.microsoft.icon", + "image/x-icon", + "text/css", + "text/html", + "text/javascript", + "text/plain", + "text/xml" +) -mimetype.assign = ( ".png" => "image/png", - ".jpg" => "image/jpeg", - ".jpeg" => "image/jpeg", - ".html" => "text/html", - ".css" => "text/css; charset=utf-8", - ".js" => "application/javascript; charset=utf-8", - ".json" => "application/json", - ".txt" => "text/plain", - ".svg" => "image/svg+xml" ) +mimetype.assign = ( + ".ico" => "image/x-icon", + ".jpeg" => "image/jpeg", + ".jpg" => "image/jpeg", + ".png" => "image/png", + ".svg" => "image/svg+xml", + ".css" => "text/css; charset=utf-8", + ".html" => "text/html; charset=utf-8", + ".js" => "text/javascript; charset=utf-8", + ".json" => "application/json; charset=utf-8", + ".map" => "application/json; charset=utf-8", + ".txt" => "text/plain; charset=utf-8", + ".eot" => "application/vnd.ms-fontobject", + ".otf" => "font/otf", + ".ttc" => "font/collection", + ".ttf" => "font/ttf", + ".woff" => "font/woff", + ".woff2" => "font/woff2" +) # default listening port for IPv6 falls back to the IPv4 port include_shell "/usr/share/lighttpd/use-ipv6.pl " + server.port @@ -77,9 +104,12 @@ $HTTP["url"] =~ "^/admin/" { # Block . files from being served, such as .git, .github, .gitignore $HTTP["url"] =~ "^/admin/\.(.*)" { - url.access-deny = ("") + url.access-deny = ("") } +# Default expire header +expire.url = ( "" => "access plus 0 seconds" ) + # Add user chosen options held in external file # This uses include_shell instead of an include wildcard for compatibility include_shell "cat external.conf 2>/dev/null" diff --git a/advanced/lighttpd.conf.fedora b/advanced/lighttpd.conf.fedora index 05fb6435..8e3bddc4 100644 --- a/advanced/lighttpd.conf.fedora +++ b/advanced/lighttpd.conf.fedora @@ -16,15 +16,15 @@ ############################################################################### server.modules = ( - "mod_access", - "mod_auth", - "mod_fastcgi", - "mod_accesslog", - "mod_expire", - "mod_compress", - "mod_redirect", - "mod_setenv", - "mod_rewrite" + "mod_access", + "mod_auth", + "mod_expire", + "mod_fastcgi", + "mod_accesslog", + "mod_compress", + "mod_redirect", + "mod_setenv", + "mod_rewrite" ) server.document-root = "/var/www/html" @@ -38,41 +38,67 @@ server.port = 80 accesslog.filename = "/var/log/lighttpd/access.log" accesslog.format = "%{%s}t|%V|%r|%s|%b" - index-file.names = ( "index.php", "index.html", "index.lighttpd.html" ) url.access-deny = ( "~", ".inc", ".md", ".yml", ".ini" ) static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" ) -compress.cache-dir = "/var/cache/lighttpd/compress/" -compress.filetype = ( "application/javascript", "text/css", "text/html", "text/plain" ) +compress.cache-dir = "/var/cache/lighttpd/compress/" +compress.filetype = ( + "application/json", + "application/vnd.ms-fontobject", + "application/xml", + "font/eot", + "font/opentype", + "font/otf", + "font/ttf", + "image/bmp", + "image/svg+xml", + "image/vnd.microsoft.icon", + "image/x-icon", + "text/css", + "text/html", + "text/javascript", + "text/plain", + "text/xml" +) -mimetype.assign = ( ".png" => "image/png", - ".jpg" => "image/jpeg", - ".jpeg" => "image/jpeg", - ".html" => "text/html", - ".css" => "text/css; charset=utf-8", - ".js" => "application/javascript; charset=utf-8", - ".json" => "application/json", - ".txt" => "text/plain", - ".svg" => "image/svg+xml" ) +mimetype.assign = ( + ".ico" => "image/x-icon", + ".jpeg" => "image/jpeg", + ".jpg" => "image/jpeg", + ".png" => "image/png", + ".svg" => "image/svg+xml", + ".css" => "text/css; charset=utf-8", + ".html" => "text/html; charset=utf-8", + ".js" => "text/javascript; charset=utf-8", + ".json" => "application/json; charset=utf-8", + ".map" => "application/json; charset=utf-8", + ".txt" => "text/plain; charset=utf-8", + ".eot" => "application/vnd.ms-fontobject", + ".otf" => "font/otf", + ".ttc" => "font/collection", + ".ttf" => "font/ttf", + ".woff" => "font/woff", + ".woff2" => "font/woff2" +) # default listening port for IPv6 falls back to the IPv4 port #include_shell "/usr/share/lighttpd/use-ipv6.pl " + server.port #include_shell "/usr/share/lighttpd/create-mime.assign.pl" #include_shell "/usr/share/lighttpd/include-conf-enabled.pl" -fastcgi.server = ( ".php" => - ( "localhost" => - ( - "socket" => "/tmp/php-fastcgi.socket", - "bin-path" => "/usr/bin/php-cgi" - ) - ) - ) +fastcgi.server = ( + ".php" => ( + "localhost" => ( + "socket" => "/tmp/php-fastcgi.socket", + "bin-path" => "/usr/bin/php-cgi" + ) + ) +) # If the URL starts with /admin, it is the Web interface $HTTP["url"] =~ "^/admin/" { - # Create a response header for debugging using curl -I + # Create a response header for debugging using curl -I setenv.add-response-header = ( "X-Pi-hole" => "The Pi-hole Web interface is working!", "X-Frame-Options" => "DENY" @@ -86,9 +112,12 @@ $HTTP["url"] =~ "^/admin/" { # Block . files from being served, such as .git, .github, .gitignore $HTTP["url"] =~ "^/admin/\.(.*)" { - url.access-deny = ("") + url.access-deny = ("") } +# Default expire header +expire.url = ( "" => "access plus 0 seconds" ) + # Add user chosen options held in external file # This uses include_shell instead of an include wildcard for compatibility include_shell "cat external.conf 2>/dev/null"