From b2fd7be3ff755e17e9d303f03b9a2345623fd384 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Tue, 20 Oct 2015 18:53:11 +0200
Subject: nginx service: allow multiple listen entries

---
 krebs/3modules/nginx.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'krebs/3modules/nginx.nix')

diff --git a/krebs/3modules/nginx.nix b/krebs/3modules/nginx.nix
index c5f38c271..0530921a0 100644
--- a/krebs/3modules/nginx.nix
+++ b/krebs/3modules/nginx.nix
@@ -25,8 +25,12 @@ let
           ];
         };
         listen = mkOption {
-          type = with types; str;
+          type = with types; either str (listOf str);
           default = "80";
+          apply = x:
+            if typeOf x != "list"
+              then [x]
+              else x;
         };
         locations = mkOption {
           type = with types; listOf (attrsOf str);
@@ -70,7 +74,7 @@ let
 
   to-server = { server-names, listen, locations, extraConfig, ... }: ''
     server {
-      listen ${listen};
+      ${concatMapStringsSep "\n" (x: "listen ${x};") listen}
       server_name ${toString server-names};
       ${extraConfig}
       ${indent (concatStrings (map to-location locations))}
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/0d300000.lock: No such file or directory (2)