diff options
author | Joachim Schiele <js@lastlog.de> | 2017-02-06 01:08:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-06 01:08:58 +0100 |
commit | d4917286530b95720eac05e68c7fbcc1dd651774 (patch) | |
tree | b4164d60835b9eac8863aa93de5537867955c4e3 /nixos/modules/services/web-servers/apache-httpd | |
parent | b5957eaf2fdf3f363564abf577005a9f1d55425c (diff) | |
download | nixlib-d4917286530b95720eac05e68c7fbcc1dd651774.tar nixlib-d4917286530b95720eac05e68c7fbcc1dd651774.tar.gz nixlib-d4917286530b95720eac05e68c7fbcc1dd651774.tar.bz2 nixlib-d4917286530b95720eac05e68c7fbcc1dd651774.tar.lz nixlib-d4917286530b95720eac05e68c7fbcc1dd651774.tar.xz nixlib-d4917286530b95720eac05e68c7fbcc1dd651774.tar.zst nixlib-d4917286530b95720eac05e68c7fbcc1dd651774.zip |
httpd: added serviceExpression which extends the serviceType concept -> allows that httpd services can live outside of nixpkgs (#22269)
Diffstat (limited to 'nixos/modules/services/web-servers/apache-httpd')
-rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index dc0ca501a484..ed77e0844769 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -63,6 +63,8 @@ let let svcFunction = if svc ? function then svc.function + # instead of using serviceType="mediawiki"; you can copy mediawiki.nix to any location outside nixpkgs, modify it at will, and use serviceExpression=./mediawiki.nix; + else if svc ? serviceExpression then import (toString svc.serviceExpression) else import (toString "${toString ./.}/${if svc ? serviceType then svc.serviceType else svc.serviceName}.nix"); config = (evalModules { modules = [ { options = res.options; config = svc.config or svc; } ]; |