From c7429711b8cd54a9eaa11649cdd17a3011efc3b3 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 20 Oct 2013 22:52:02 +0200 Subject: [PATCH] nixos/nginx: allow to specify which package to use This enables to override which plugins to include with nginx by allowing to change nginx package. I also removed webdav option in nginx nixos module, because you can now specify this by overriding nginx package. --- .../modules/services/web-servers/nginx/default.nix | 13 ++++++++----- 1 file 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 b26af1aa744..4a1b6de2873 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"; - }; }; };