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

* Use sub-modules for httpd virtual hosts. This add documentation entries

Browse Source 
and allow non-intrusive extensions of virtual hosts.

svn path=/nixos/trunk/; revision=18107
This commit is contained in:
Nicolas Pierron 2009-11-04 17:00:53 +00:00
parent ff1d9969fb
commit 0e22df1587
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/services/web-servers/apache-httpd/per-server-options.nix
View File

@ -6,7 +6,7 @@
{config, pkgs, ...}: {config, pkgs, ...}:
let let
inherit (pkgs.lib) mkOption addDefaultOptionValues; inherit (pkgs.lib) mkOption addDefaultOptionValues types;
perServerOptions = {forMainServer}: { perServerOptions = {forMainServer}: {
@ -161,6 +161,7 @@ in
documentRoot = "/data/webroot-bar"; documentRoot = "/data/webroot-bar";
} }
]; ];
type = with types; listOf optionSet;
description = '' description = ''
Specification of the virtual hosts served by Apache. Each Specification of the virtual hosts served by Apache. Each
element should be an attribute set specifying the element should be an attribute set specifying the
@ -168,12 +169,9 @@ in
are the non-global options permissible for the main host. are the non-global options permissible for the main host.
''; '';
# Add the default value for each function which is not defined. options = [
# This should be replaced by sub-modules. vhostOptions
apply = ];
map (vhost:
addDefaultOptionValues vhostOptions vhost
);
}; };
} }