diff options
author | Jonas Smedegaard <dr@jones.dk> | 2016-04-17 10:16:11 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2016-04-17 10:16:11 +0200 |
commit | df66448480c8251f3f2ba8e281e81507e0e647d1 (patch) | |
tree | 1a61f7ef5a0f509b1ba8769adc90379a5c08ff25 /apache2/conf.d | |
parent | 806f706c51023e23c3f78251fe7ef49fde499125 (diff) |
Move local snippets html5 media to conf-available dir.
Diffstat (limited to 'apache2/conf.d')
-rw-r--r-- | apache2/conf.d/local-html5.conf | 225 | ||||
-rw-r--r-- | apache2/conf.d/local-media.conf | 5 |
2 files changed, 0 insertions, 230 deletions
diff --git a/apache2/conf.d/local-html5.conf b/apache2/conf.d/local-html5.conf deleted file mode 100644 index 204473e..0000000 --- a/apache2/conf.d/local-html5.conf +++ /dev/null @@ -1,225 +0,0 @@ -# Apache configuration file -# httpd.apache.org/docs/2.2/mod/quickreference.html - -# Note .htaccess files are an overhead, this logic should be in your Apache config if possible -# httpd.apache.org/docs/2.2/howto/htaccess.html - -# Techniques in here adapted from all over, including: -# Kroc Camen: camendesign.com/.htaccess -# perishablepress.com/press/2006/01/10/stupid-htaccess-tricks/ -# Sample .htaccess file of CMS MODx: modxcms.com - - -### -### If you run a webserver other than Apache, consider: -### github.com/paulirish/html5-boilerplate-server-configs -### - - - -# ---------------------------------------------------------------------- -# Better website experience for IE users -# ---------------------------------------------------------------------- - -# Force the latest IE version, in various cases when it may fall back to IE7 mode -# github.com/rails/rails/commit/123eb25#commitcomment-118920 -# Use ChromeFrame if it's installed for a better experience for the poor IE folk - -<IfModule mod_headers.c> - Header set X-UA-Compatible "IE=Edge,chrome=1" - # mod_headers can't match by content-type, but we don't want to send this header on *everything*... - <FilesMatch "\.(js|css|gif|png|jpe?g|pdf|xml|oga|ogg|m4a|ogv|mp4|m4v|webm|svg|svgz|eot|ttf|otf|woff|ico|webp|appcache|manifest|htc|crx|xpi|safariextz|vcf)$" > - Header unset X-UA-Compatible - </FilesMatch> -</IfModule> - - -# ---------------------------------------------------------------------- -# Proper MIME type for all files -# ---------------------------------------------------------------------- - - -# JavaScript -# Normalize to standard type (it's sniffed in IE anyways) -# tools.ietf.org/html/rfc4329#section-7.2 -AddType application/javascript js - -# Audio -AddType audio/ogg oga ogg -AddType audio/mp4 m4a - -# Video -AddType video/ogg ogv -AddType video/mp4 mp4 m4v -AddType video/webm webm - -# SVG. -# Required for svg webfonts on iPad -# twitter.com/FontSquirrel/status/14855840545 -AddType image/svg+xml svg svgz -AddEncoding gzip svgz - -# Webfonts -AddType application/vnd.ms-fontobject eot -AddType application/x-font-ttf ttf ttc -AddType font/opentype otf -AddType application/x-font-woff woff - -# Assorted types -AddType image/x-icon ico -AddType image/webp webp -AddType text/cache-manifest appcache manifest -AddType text/x-component htc -AddType application/x-chrome-extension crx -AddType application/x-xpinstall xpi -AddType application/octet-stream safariextz -AddType text/x-vcard vcf - - - -# ---------------------------------------------------------------------- -# Gzip compression -# ---------------------------------------------------------------------- - -<IfModule mod_deflate.c> - -# Force deflate for mangled headers developer.yahoo.com/blogs/ydn/posts/2010/12/pushing-beyond-gzipping/ -<IfModule mod_setenvif.c> - <IfModule mod_headers.c> - SetEnvIfNoCase ^(Accept-EncodXng|X-cept-Encoding|X{15}|~{15}|-{15})$ ^((gzip|deflate)\s*,?\s*)+|[X~-]{4,13}$ HAVE_Accept-Encoding - RequestHeader append Accept-Encoding "gzip,deflate" env=HAVE_Accept-Encoding - </IfModule> -</IfModule> - -# HTML, TXT, CSS, JavaScript, JSON, XML, HTC: -<IfModule filter_module> - FilterDeclare COMPRESS - FilterProvider COMPRESS DEFLATE resp=Content-Type $text/html - FilterProvider COMPRESS DEFLATE resp=Content-Type $text/css - FilterProvider COMPRESS DEFLATE resp=Content-Type $text/plain - FilterProvider COMPRESS DEFLATE resp=Content-Type $text/xml - FilterProvider COMPRESS DEFLATE resp=Content-Type $text/x-component - FilterProvider COMPRESS DEFLATE resp=Content-Type $application/javascript - FilterProvider COMPRESS DEFLATE resp=Content-Type $application/json - FilterProvider COMPRESS DEFLATE resp=Content-Type $application/xml - FilterProvider COMPRESS DEFLATE resp=Content-Type $application/xhtml+xml - FilterProvider COMPRESS DEFLATE resp=Content-Type $application/rss+xml - FilterProvider COMPRESS DEFLATE resp=Content-Type $application/atom+xml - FilterProvider COMPRESS DEFLATE resp=Content-Type $application/vnd.ms-fontobject - FilterProvider COMPRESS DEFLATE resp=Content-Type $image/svg+xml - FilterProvider COMPRESS DEFLATE resp=Content-Type $image/x-icon - FilterProvider COMPRESS DEFLATE resp=Content-Type $application/x-font-ttf - FilterProvider COMPRESS DEFLATE resp=Content-Type $font/opentype - FilterChain COMPRESS - FilterProtocol COMPRESS DEFLATE change=yes;byteranges=no -</IfModule> - -<IfModule !mod_filter.c> - # Legacy versions of Apache - AddOutputFilterByType DEFLATE text/html text/plain text/css application/json - AddOutputFilterByType DEFLATE application/javascript - AddOutputFilterByType DEFLATE text/xml application/xml text/x-component - AddOutputFilterByType DEFLATE application/xhtml+xml application/rss+xml application/atom+xml - AddOutputFilterByType DEFLATE image/x-icon image/svg+xml application/vnd.ms-fontobject application/x-font-ttf font/opentype -</IfModule> -</IfModule> - - - -# ---------------------------------------------------------------------- -# Expires headers (for better cache control) -# ---------------------------------------------------------------------- - -# These are pretty far-future expires headers. -# They assume you control versioning with cachebusting query params like -# <script src="application.js?20100608"> -# Additionally, consider that outdated proxies may miscache -# www.stevesouders.com/blog/2008/08/23/revving-filenames-dont-use-querystring/ - -# If you don't use filenames to version, lower the CSS and JS to something like -# "access plus 1 week" or so. - -<IfModule mod_expires.c> - ExpiresActive on - -# Perhaps better to whitelist expires rules? Perhaps. - ExpiresDefault "access plus 1 month" - -# cache.appcache needs re-requests in FF 3.6 (thanks Remy ~Introducing HTML5) - ExpiresByType text/cache-manifest "access plus 0 seconds" - -# Your document html - ExpiresByType text/html "access plus 0 seconds" - -# Data - ExpiresByType text/xml "access plus 0 seconds" - ExpiresByType application/xml "access plus 0 seconds" - ExpiresByType application/json "access plus 0 seconds" - -# Feed - ExpiresByType application/rss+xml "access plus 1 hour" - ExpiresByType application/atom+xml "access plus 1 hour" - -# Favicon (cannot be renamed) - ExpiresByType image/x-icon "access plus 1 week" - -# Media: images, video, audio - ExpiresByType image/gif "access plus 1 month" - ExpiresByType image/png "access plus 1 month" - ExpiresByType image/jpg "access plus 1 month" - ExpiresByType image/jpeg "access plus 1 month" - ExpiresByType video/ogg "access plus 1 month" - ExpiresByType audio/ogg "access plus 1 month" - ExpiresByType video/mp4 "access plus 1 month" - ExpiresByType video/webm "access plus 1 month" - -# HTC files (css3pie) - ExpiresByType text/x-component "access plus 1 month" - -# Webfonts - ExpiresByType application/x-font-ttf "access plus 1 month" - ExpiresByType font/opentype "access plus 1 month" - ExpiresByType application/x-font-woff "access plus 1 month" - ExpiresByType image/svg+xml "access plus 1 month" - ExpiresByType application/vnd.ms-fontobject "access plus 1 month" - -# CSS and JavaScript - ExpiresByType text/css "access plus 1 year" - ExpiresByType application/javascript "access plus 1 year" - - <IfModule mod_headers.c> - Header append Cache-Control "public" - </IfModule> - -</IfModule> - - - -# ---------------------------------------------------------------------- -# ETag removal -# ---------------------------------------------------------------------- - -# FileETag None is not enough for every server. -<IfModule mod_headers.c> - Header unset ETag -</IfModule> - -# Since we're sending far-future expires, we don't need ETags for -# static content. -# developer.yahoo.com/performance/rules.html#etags -FileETag None - - - -# ---------------------------------------------------------------------- -# Stop screen flicker in IE on CSS rollovers -# ---------------------------------------------------------------------- - -# The following directives stop screen flicker in IE on CSS rollovers - in -# combination with the "ExpiresByType" rules for images (see above). If -# needed, un-comment the following rules. - -# BrowserMatch "MSIE" brokenvary=1 -# BrowserMatch "Mozilla/4.[0-9]{2}" brokenvary=1 -# BrowserMatch "Opera" !brokenvary -# SetEnvIf brokenvary 1 force-no-vary diff --git a/apache2/conf.d/local-media.conf b/apache2/conf.d/local-media.conf deleted file mode 100644 index fbc9be4..0000000 --- a/apache2/conf.d/local-media.conf +++ /dev/null @@ -1,5 +0,0 @@ -AddType video/webm webm -AddType video/h264 h264 -AddType application/x-mpegURL .m3u8 -AddType video/MP2T .ts -SetEnvIfNoCase Request_URI \.(og[gv]|mp4|m4v|ts|webm)$ no-gzip dont-vary |