Revert "Apache service module: allow compression"

This reverts commit 164f6ff2a8485c1130cd710992a6084258cdad28 per
https://github.com/NixOS/nixpkgs/pull/9407#issuecomment-134523359
(it's too site-specific). Furthermore this should be an option at the
virtual host level.

Changed files
+1 -30
nixos
modules
services
web-servers
apache-httpd
+1 -30
nixos/modules/services/web-servers/apache-httpd/default.nix
···
]
++ (if mainCfg.multiProcessingModule == "prefork" then [ "cgi" ] else [ "cgid" ])
++ optional enableSSL "ssl"
-
++ optional mainCfg.enableCompression "deflate"
++ extraApacheModules;
···
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
···
${mimeConf}
${loggingConf}
${browserHacks}
-
${optionalString mainCfg.enableCompression compressConf}
Include ${httpd}/conf/extra/httpd-default.conf
Include ${httpd}/conf/extra/httpd-autoindex.conf
···
enable = mkOption {
type = types.bool;
default = false;
-
description = "Enable the Apache HTTP Server.";
+
description = "Whether to enable the Apache HTTP Server.";
};
package = mkOption {
···
example = 500;
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.";
};
}