diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2013-11-07 02:59:09 -0800 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2013-11-07 02:59:09 -0800 |
commit | f8ddc0cbd47e1f1eb456a74b58b52fb18e3753e4 (patch) | |
tree | b2e71f4b9f7a2aa5d318ea0b02d13ade0abaa43a /nixos | |
parent | ed67672aac525c7b703963a84f277e8d9c267bbe (diff) | |
parent | c7429711b8cd54a9eaa11649cdd17a3011efc3b3 (diff) | |
download | nixlib-f8ddc0cbd47e1f1eb456a74b58b52fb18e3753e4.tar nixlib-f8ddc0cbd47e1f1eb456a74b58b52fb18e3753e4.tar.gz nixlib-f8ddc0cbd47e1f1eb456a74b58b52fb18e3753e4.tar.bz2 nixlib-f8ddc0cbd47e1f1eb456a74b58b52fb18e3753e4.tar.lz nixlib-f8ddc0cbd47e1f1eb456a74b58b52fb18e3753e4.tar.xz nixlib-f8ddc0cbd47e1f1eb456a74b58b52fb18e3753e4.tar.zst nixlib-f8ddc0cbd47e1f1eb456a74b58b52fb18e3753e4.zip |
Merge pull request #1099 from offlinehacker/nixos/nginx/package_change_support
nixos/nginx: allow to specify which package to use
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/web-servers/nginx/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index b26af1aa7445..4a1b6de2873f 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -4,7 +4,7 @@ with pkgs.lib; let cfg = config.services.nginx; - nginx = pkgs.nginx.override { fullWebDAV = cfg.fullWebDAV; }; + nginx = cfg.package; configFile = pkgs.writeText "nginx.conf" '' user ${cfg.user} ${cfg.group}; daemon off; @@ -22,6 +22,13 @@ in "; }; + package = mkOption { + default = pkgs.nginx; + description = " + Nginx package to use. + "; + }; + config = mkOption { default = "events {}"; description = " @@ -46,10 +53,6 @@ in description = "Group account under which nginx runs."; }; - fullWebDAV = mkOption { - default = false; - description = "Compile in a third party module providing full WebDAV support"; - }; }; }; |