diff options
author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2013-10-20 22:52:02 +0200 |
---|---|---|
committer | Jaka Hudoklin <jakahudoklin@gmail.com> | 2013-10-20 22:52:02 +0200 |
commit | c7429711b8cd54a9eaa11649cdd17a3011efc3b3 (patch) | |
tree | 47bfe6a031140f7f25d0e9ed8a858fd0440f1c28 /nixos/modules/services/web-servers | |
parent | 3c3c631a450106e7936b717d0170b4eadd3b0fb3 (diff) | |
download | nixlib-c7429711b8cd54a9eaa11649cdd17a3011efc3b3.tar nixlib-c7429711b8cd54a9eaa11649cdd17a3011efc3b3.tar.gz nixlib-c7429711b8cd54a9eaa11649cdd17a3011efc3b3.tar.bz2 nixlib-c7429711b8cd54a9eaa11649cdd17a3011efc3b3.tar.lz nixlib-c7429711b8cd54a9eaa11649cdd17a3011efc3b3.tar.xz nixlib-c7429711b8cd54a9eaa11649cdd17a3011efc3b3.tar.zst nixlib-c7429711b8cd54a9eaa11649cdd17a3011efc3b3.zip |
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.
Diffstat (limited to 'nixos/modules/services/web-servers')
-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"; - }; }; }; |