From 8c465870fc94d8544a164e547f174fd0bb9d8661 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 28 Jul 2016 10:55:34 +0200
Subject: retiolum: support nets.<net>.tinc.port

---
 krebs/3modules/retiolum.nix | 6 ++++--
 krebs/4lib/types.nix        | 7 ++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/krebs/3modules/retiolum.nix b/krebs/3modules/retiolum.nix
index 18e0dd65..8e91ee6e 100644
--- a/krebs/3modules/retiolum.nix
+++ b/krebs/3modules/retiolum.nix
@@ -132,8 +132,9 @@ let
             routeable IPv4 or IPv6 address.
 
             In stockholm this can be done by configuring:
-              krebs.hosts.${connect-host}.nets.${netname?"retiolum"}.via.addrs4 =
-                [ "${external-ip} ${external-port}" ]
+              krebs.hosts.${connect-host}.nets.${netname?"retiolum"}.via.ip4.addr =
+                "${external-ip} ${external-port}"
+              krebs.hosts.${connect-host}.nets.${netname?"retiolum"}.tinc.port = 1655;
           '';
         };
 
@@ -176,6 +177,7 @@ let
               Interface = ${netname}
               ${concatStrings (map (c: "ConnectTo = ${c}\n") cfg.connectTo)}
               PrivateKeyFile = ${cfg.privkey.path}
+              Port = ${toString cfg.host.nets.${cfg.netname}.tinc.port}
               ${cfg.extraConfig}
             '';
             "tinc-up" = pkgs.writeDash "${netname}-tinc-up" ''
diff --git a/krebs/4lib/types.nix b/krebs/4lib/types.nix
index 8906eff4..d057cef1 100644
--- a/krebs/4lib/types.nix
+++ b/krebs/4lib/types.nix
@@ -130,7 +130,7 @@ types // rec {
               type = str;
               default = concatStringsSep "\n" (
                 (optionals (net.via != null)
-                  (map (a: "Address = ${a}") net.via.addrs))
+                  (map (a: "Address = ${a} ${toString config.port}") net.via.addrs))
                 ++
                 (map (a: "Subnet = ${a}") net.addrs)
                 ++
@@ -140,6 +140,11 @@ types // rec {
             pubkey = mkOption {
               type = tinc-pubkey;
             };
+            port = mkOption {
+              type = int;
+              description = "tinc port to use to connect to host";
+              default = 655;
+            };
           };
         }));
         default = null;
-- 
cgit v1.2.3