Added possibility to use names instead of full paths in httpd subservices. Yes, the same dirty hack again
svn path=/nixos/trunk/; revision=11615
This commit is contained in:
parent
5e1ee10f3c
commit
02decddeb1
@ -45,8 +45,11 @@ let
|
||||
|
||||
callSubservices = serverInfo: defs:
|
||||
let f = svc:
|
||||
let config = addDefaultOptionValues res.options svc.config;
|
||||
res = svc.function {inherit config pkgs serverInfo;};
|
||||
let
|
||||
svcFunction = if svc ? function then
|
||||
svc.function else (import ( ./noDir/.. + ("/" + svc.serviceName + ".nix")));
|
||||
config = addDefaultOptionValues res.options svc.config;
|
||||
res = svcFunction {inherit config pkgs serverInfo;};
|
||||
in res;
|
||||
in map f defs;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user