svn path=/nixos/branches/modular-nixos/; revision=16039
This commit is contained in:
Eelco Dolstra 2009-06-24 22:27:54 +00:00
parent 9704472d1c
commit b701207ead

View file

@ -211,7 +211,7 @@ let
extraModules = pkgs.lib.attrByPath ["extraModules"] [] mainCfg;
extraForeignModules = pkgs.lib.filter builtins.isAttrs extraModules;
extraApachaModules = pkgs.lib.filter (x :! (builtins.isAttrs x)) extraModules; # I'd prefer using builtins.isString here, but doesn't exist yet
extraApacheModules = pkgs.lib.filter (x: !(builtins.isAttrs x)) extraModules; # I'd prefer using builtins.isString here, but doesn't exist yet
makeServerInfo = cfg: {
# Canonical name must not include a trailing slash.
@ -304,7 +304,7 @@ let
"mime" "dav" "status" "autoindex" "asis" "info" "cgi" "dav_fs"
"vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling"
"userdir" "alias" "rewrite" "proxy" "proxy_http"
] ++ optional enableSSL "ssl" ++ extraApachaModules;
] ++ optional enableSSL "ssl" ++ extraApacheModules;
loggingConf = ''