From 49b8d341f64b039448a21feeaed777573574549d Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 21 Oct 2015 18:47:26 +0200
Subject: m 3 tinc_graphs: merge instead of override nginx config

---
 makefu/3modules/tinc_graphs.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'makefu/3modules')

diff --git a/makefu/3modules/tinc_graphs.nix b/makefu/3modules/tinc_graphs.nix
index 42b08d62..1f87f00c 100644
--- a/makefu/3modules/tinc_graphs.nix
+++ b/makefu/3modules/tinc_graphs.nix
@@ -31,6 +31,7 @@ let
         };
 
         listen = mkOption {
+          # use the type of the nginx listen option
           type = with types; listOf str;
           description = "listen address for anonymous graphs";
           default = [ "80" ];
@@ -120,23 +121,23 @@ let
       createHome = true;
     };
 
-    krebs.nginx.servers = mkIf cfg.krebsNginx.enable {
-      tinc_graphs_complete = cfg.nginx.complete {
+    krebs.nginx.servers = mkIf cfg.nginx.enable {
+      tinc_graphs_complete = mkMerge [ cfg.nginx.complete  {
         locations = [
           (nameValuePair "/" ''
             autoindex on;
             root ${internal_dir};
           '')
         ];
-      };
-      tinc_graphs_anonymous = cfg.nginx.anonymous // {
+      }] ;
+      tinc_graphs_anonymous = mkMerge [ cfg.nginx.anonymous {
         locations = [
           (nameValuePair "/" ''
             autoindex on;
             root ${external_dir};
           '')
         ];
-      };
+      }];
     };
   };
 
-- 
cgit v1.2.3