diff options
author | lassulus <lass@blue.r> | 2018-11-10 19:43:15 +0100 |
---|---|---|
committer | lassulus <lass@blue.r> | 2018-11-10 19:43:15 +0100 |
commit | 05b288604e7e653efb6035b9953aa849e6e6bc19 (patch) | |
tree | 136f039487abfd3708cbb037f822e22e2575a0e2 /krebs | |
parent | eff97662c02f385b1740929639817fc5b8318f07 (diff) | |
parent | 550f8fce2571537b23588b41e363c27a6cd46c0e (diff) |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs')
-rw-r--r-- | krebs/3modules/tinc.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/krebs/3modules/tinc.nix b/krebs/3modules/tinc.nix index b032f3148..ecd449b09 100644 --- a/krebs/3modules/tinc.nix +++ b/krebs/3modules/tinc.nix @@ -75,6 +75,7 @@ let ${iproute}/sbin/ip -6 addr add ${net.ip6.addr} dev ${netname} ${iproute}/sbin/ip -6 route add ${net.ip6.prefix} dev ${netname} ''} + ${tinc.config.tincUpExtra} ''; description = '' tinc-up script to be used. Defaults to setting the @@ -83,6 +84,11 @@ let ''; }; + tincUpExtra = mkOption { + type = types.str; + default = ""; + }; + tincPackage = mkOption { type = types.package; default = pkgs.tinc; |