Skip to content

Commit

Permalink
Revert "Apache service module: allow compression"
Browse files Browse the repository at this point in the history
This reverts commit 164f6ff per
#9407 (comment)
(it's too site-specific). Furthermore this should be an option at the
virtual host level.
  • Loading branch information
edolstra committed Aug 28, 2015
1 parent 77354eb commit 9d82f7e
Showing 1 changed file with 1 addition and 30 deletions.
31 changes: 1 addition & 30 deletions nixos/modules/services/web-servers/apache-httpd/default.nix
Expand Up @@ -117,7 +117,6 @@ let
]
++ (if mainCfg.multiProcessingModule == "prefork" then [ "cgi" ] else [ "cgid" ])
++ optional enableSSL "ssl"
++ optional mainCfg.enableCompression "deflate"
++ extraApacheModules;


Expand Down Expand Up @@ -177,27 +176,6 @@ let
SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5:!EXP
'';

# From http://paulstamatiou.com/how-to-optimize-your-apache-site-with-mod-deflate/
compressConf = ''
SetOutputFilter DEFLATE
# Don't compress binaries
SetEnvIfNoCase Request_URI .(?:exe|t?gz|zip|iso|tar|bz2|sit|rar) no-gzip dont-vary
# Don't compress images
SetEnvIfNoCase Request_URI .(?:gif|jpe?g|jpg|ico|png) no-gzip dont-vary
# Don't compress PDFs
SetEnvIfNoCase Request_URI .pdf no-gzip dont-vary
# Don't compress flash files (only relevant if you host your own videos)
SetEnvIfNoCase Request_URI .flv no-gzip dont-vary
# Netscape 4.X has some problems
BrowserMatch ^Mozilla/4 gzip-only-text/html
# Netscape 4.06-4.08 have some more problems
BrowserMatch ^Mozilla/4.0[678] no-gzip
# MSIE masquerades as Netscape, but it is fine
BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
# Make sure proxies don't deliver the wrong content
Header append Vary User-Agent env=!dont-vary
'';

mimeConf = ''
TypesConfig ${httpd}/conf/mime.types
Expand Down Expand Up @@ -373,7 +351,6 @@ let
${mimeConf}
${loggingConf}
${browserHacks}
${optionalString mainCfg.enableCompression compressConf}
Include ${httpd}/conf/extra/httpd-default.conf
Include ${httpd}/conf/extra/httpd-autoindex.conf
Expand Down Expand Up @@ -446,7 +423,7 @@ in
enable = mkOption {
type = types.bool;
default = false;
description = "Enable the Apache HTTP Server.";
description = "Whether to enable the Apache HTTP Server.";
};

package = mkOption {
Expand Down Expand Up @@ -609,12 +586,6 @@ in
description =
"Maximum number of httpd requests answered per httpd child (prefork), 0 means unlimited";
};

enableCompression = mkOption {
type = types.bool;
default = false;
description = "Enable compression of responses using mod_deflate.";
};
}

# Include the options shared between the main server and virtual hosts.
Expand Down

0 comments on commit 9d82f7e

Please sign in to comment.