From 222ca361e38b09ddef563abaaacd114ec86e2a5c Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 19 Oct 2015 20:36:09 +0200 Subject: nginx service: add port option and extraConfig --- krebs/3modules/nginx.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/krebs/3modules/nginx.nix b/krebs/3modules/nginx.nix index 702e8a7f6..65f3b238e 100644 --- a/krebs/3modules/nginx.nix +++ b/krebs/3modules/nginx.nix @@ -24,9 +24,17 @@ let "${config.networking.hostName}.retiolum" ]; }; + port = mkOption { + type = with types; int; + default = 80; + }; locations = mkOption { type = with types; listOf (attrsOf str); }; + extraConfig = mkOption { + type = with types; str; + default = ""; + }; }; default = {}; }; @@ -60,10 +68,11 @@ let } ''; - to-server = { server-names, locations, ... }: '' + to-server = { server-names, port, locations, extraConfig, ... }: '' server { - listen 80; + listen ${toString port}; server_name ${toString server-names}; + ${extraConfig} ${indent (concatStrings (map to-location locations))} } ''; -- cgit v1.2.3