mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-21 04:42:07 +03:00
* Use sub-modules for httpd virtual hosts. This add documentation entries
and allow non-intrusive extensions of virtual hosts. svn path=/nixos/trunk/; revision=18107
This commit is contained in:
parent
ff1d9969fb
commit
0e22df1587
@ -6,7 +6,7 @@
|
||||
{config, pkgs, ...}:
|
||||
|
||||
let
|
||||
inherit (pkgs.lib) mkOption addDefaultOptionValues;
|
||||
inherit (pkgs.lib) mkOption addDefaultOptionValues types;
|
||||
|
||||
perServerOptions = {forMainServer}: {
|
||||
|
||||
@ -161,6 +161,7 @@ in
|
||||
documentRoot = "/data/webroot-bar";
|
||||
}
|
||||
];
|
||||
type = with types; listOf optionSet;
|
||||
description = ''
|
||||
Specification of the virtual hosts served by Apache. Each
|
||||
element should be an attribute set specifying the
|
||||
@ -168,16 +169,13 @@ in
|
||||
are the non-global options permissible for the main host.
|
||||
'';
|
||||
|
||||
# Add the default value for each function which is not defined.
|
||||
# This should be replaced by sub-modules.
|
||||
apply =
|
||||
map (vhost:
|
||||
addDefaultOptionValues vhostOptions vhost
|
||||
);
|
||||
options = [
|
||||
vhostOptions
|
||||
];
|
||||
};
|
||||
|
||||
}
|
||||
// perServerOptions {forMainServer = true;}
|
||||
;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user