public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* extraDirectores -> extraConfig.

Browse Source 
svn path=/nixos/trunk/; revision=10731
This commit is contained in:
Eelco Dolstra 2008-02-18 15:00:26 +00:00
parent 8a1d362447
commit bbbef0f2fa
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
upstart-jobs/apache-httpd/default.nix
View File

@ -55,7 +55,7 @@ let
"cern_meta" "expires" "headers" "usertrack" /* "unique_id" */ "setenvif" "cern_meta" "expires" "headers" "usertrack" /* "unique_id" */ "setenvif"
"mime" "dav" "status" "autoindex" "asis" "info" "cgi" "dav_fs" "mime" "dav" "status" "autoindex" "asis" "info" "cgi" "dav_fs"
"vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling" "vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling"
"userdir" "alias" "rewrite" "userdir" "alias" "rewrite" "proxy" "proxy_http"
] ++ optional cfg.enableSSL "ssl_module"; ] ++ optional cfg.enableSSL "ssl_module";
@ -193,6 +193,8 @@ let
} }
${concatMapStrings (svc: svc.extraConfig) subservices} ${concatMapStrings (svc: svc.extraConfig) subservices}
${cfg.extraConfig}
''; '';

7
upstart-jobs/apache-httpd/per-server-options.nix
View File

@ -61,15 +61,14 @@
"; ";
}; };
# !!! this is a mis-nomer, should be "extraConfig" or something. extraConfig = mkOption {
extraDirectories = mkOption {
default = ""; default = "";
example = " example = ''
<Directory /home> <Directory /home>
Options FollowSymlinks Options FollowSymlinks
AllowOverride All AllowOverride All
</Directory> </Directory>
"; '';
description = " description = "
These lines go to httpd.conf verbatim. They will go after These lines go to httpd.conf verbatim. They will go after
directories and directory aliases defined by default. directories and directory aliases defined by default.