From ebd22b2d282d3b718f173a243615d954e00254e9 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 23 Jan 2023 18:44:56 +0100 Subject: [PATCH] tinc: drop tincUpExtra --- krebs/3modules/tinc.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/krebs/3modules/tinc.nix b/krebs/3modules/tinc.nix index 4afd0a3a6..52cdafe67 100644 --- a/krebs/3modules/tinc.nix +++ b/krebs/3modules/tinc.nix @@ -26,10 +26,7 @@ with import ; Port = ${toString tinc.config.host.nets.${netname}.tinc.port} ${tinc.config.extraConfig} ''; - "tinc-up" = pkgs.writeDash "${netname}-tinc-up" /* sh */ '' - ${tinc.config.tincUp} - ${tinc.config.tincUpExtra} - ''; + "tinc-up" = pkgs.writeDash "${netname}-tinc-up" tinc.config.tincUp; }); }; @@ -85,11 +82,6 @@ with import ; ''; }; - tincUpExtra = mkOption { - type = types.str; - default = ""; - }; - tincPackage = mkOption { type = types.package; default = pkgs.tinc_pre;