Clean up Apache config and remove unused content-types

This commit is contained in:
Alex Cabal 2021-03-14 11:15:28 -05:00
parent 19d627bfed
commit e9b9f60186
2 changed files with 35 additions and 41 deletions

View file

@ -10,20 +10,18 @@ AddDefaultCharset utf-8
UseCanonicalName on UseCanonicalName on
LogLevel warn LogLevel warn
AddOutputFilterByType deflate image/svg+xml AddOutputFilterByType deflate image/svg+xml
AddType application/font-woff2 .woff2
AddType image/avif .avif AddType image/avif .avif
TraceEnable off TraceEnable off
Protocols h2 h2c http/1.1 Protocols h2 h2c http/1.1
# Set up caching directives for infrequently changed files # Set up caching directives for infrequently changed files
ExpiresActive On ExpiresActive on
ExpiresByType application/font-woff "access plus 1 month"
ExpiresByType application/font-woff2 "access plus 1 month"
ExpiresByType application/javascript "access plus 1 month" ExpiresByType application/javascript "access plus 1 month"
ExpiresByType font/woff2 "access plus 1 month"
ExpiresByType image/avif "access plus 1 month" ExpiresByType image/avif "access plus 1 month"
ExpiresByType image/gif "access plus 1 month" ExpiresByType image/gif "access plus 1 month"
ExpiresByType image/png "access plus 1 month"
ExpiresByType image/jpeg "access plus 1 month" ExpiresByType image/jpeg "access plus 1 month"
ExpiresByType image/png "access plus 1 month"
ExpiresByType image/svg+xml "access plus 1 month" ExpiresByType image/svg+xml "access plus 1 month"
ExpiresByType image/vnd.microsoft.icon "access plus 1 month" ExpiresByType image/vnd.microsoft.icon "access plus 1 month"
ExpiresByType image/x-icon "access plus 1 month" ExpiresByType image/x-icon "access plus 1 month"
@ -91,14 +89,13 @@ Define domain standardebooks.org
CGIPassAuth on CGIPassAuth on
</Directory> </Directory>
AddType application/epub+zip .epub
AddType application/x-mobi8-ebook .azw3 AddType application/x-mobi8-ebook .azw3
<Location ~ ^/ebooks/.+?/downloads/.+$> <Location ~ ^/ebooks/.+?/downloads/.+$>
# Serve distributables using the "download" dialog instead of opening in-browser # Serve distributables using the "download" dialog instead of opening in-browser
# Note: the trailing e in the Header directive is required # Note: the trailing e in the Header directive is required
SetEnvIf Request_URI ^/ebooks/.+?/downloads/(.+)$ FILENAME=$1 SetEnvIf Request_URI ^/ebooks/.+?/downloads/(.+)$ FILENAME=$1
Header set "Content-Disposition" "attachment; filename=%{FILENAME}e" Header set Content-Disposition "attachment; filename=%{FILENAME}e"
</Location> </Location>
<Location ~ ^/opds.+?$> <Location ~ ^/opds.+?$>

View file

@ -10,20 +10,18 @@ AddDefaultCharset utf-8
UseCanonicalName on UseCanonicalName on
LogLevel warn LogLevel warn
AddOutputFilterByType deflate image/svg+xml AddOutputFilterByType deflate image/svg+xml
AddType application/font-woff2 .woff2
AddType image/avif .avif AddType image/avif .avif
TraceEnable off TraceEnable off
Protocols h2 h2c http/1.1 Protocols h2 h2c http/1.1
# Set up caching directives for infrequently changed files # Set up caching directives for infrequently changed files
ExpiresActive On ExpiresActive on
ExpiresByType application/font-woff "access plus 1 month"
ExpiresByType application/font-woff2 "access plus 1 month"
ExpiresByType application/javascript "access plus 1 month" ExpiresByType application/javascript "access plus 1 month"
ExpiresByType font/woff2 "access plus 1 month"
ExpiresByType image/avif "access plus 1 month" ExpiresByType image/avif "access plus 1 month"
ExpiresByType image/gif "access plus 1 month" ExpiresByType image/gif "access plus 1 month"
ExpiresByType image/png "access plus 1 month"
ExpiresByType image/jpeg "access plus 1 month" ExpiresByType image/jpeg "access plus 1 month"
ExpiresByType image/png "access plus 1 month"
ExpiresByType image/svg+xml "access plus 1 month" ExpiresByType image/svg+xml "access plus 1 month"
ExpiresByType image/vnd.microsoft.icon "access plus 1 month" ExpiresByType image/vnd.microsoft.icon "access plus 1 month"
ExpiresByType image/x-icon "access plus 1 month" ExpiresByType image/x-icon "access plus 1 month"
@ -90,14 +88,13 @@ Define domain standardebooks.test
CGIPassAuth on CGIPassAuth on
</Directory> </Directory>
AddType application/epub+zip .epub
AddType application/x-mobi8-ebook .azw3 AddType application/x-mobi8-ebook .azw3
<Location ~ ^/ebooks/.+?/downloads/.+$> <Location ~ ^/ebooks/.+?/downloads/.+$>
# Serve distributables using the "download" dialog instead of opening in-browser # Serve distributables using the "download" dialog instead of opening in-browser
# Note: the trailing e in the Header directive is required # Note: the trailing e in the Header directive is required
SetEnvIf Request_URI ^/ebooks/.+?/downloads/(.+)$ FILENAME=$1 SetEnvIf Request_URI ^/ebooks/.+?/downloads/(.+)$ FILENAME=$1
Header set "Content-Disposition" "attachment; filename=%{FILENAME}e" Header set Content-Disposition "attachment; filename=%{FILENAME}e"
</Location> </Location>
<Location ~ ^/opds.+?$> <Location ~ ^/opds.+?$>