summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-10-21 18:47:26 +0200
committermakefu <github@syntax-fehler.de>2015-10-21 18:47:26 +0200
commit49b8d341f64b039448a21feeaed777573574549d (patch)
tree54e0c49f813be9e7e82f24c6bb48781f2db6d61f /makefu
parent506f1c0c382a66f3f2e17519004875f793e489f1 (diff)
m 3 tinc_graphs: merge instead of override nginx config
Diffstat (limited to 'makefu')
-rw-r--r--makefu/3modules/tinc_graphs.nix11
1 files changed, 6 insertions, 5 deletions
diff --git a/makefu/3modules/tinc_graphs.nix b/makefu/3modules/tinc_graphs.nix
index 42b08d62a..1f87f00cc 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};
'')
];
- };
+ }];
};
};