From 3abb88edf4bf04b60212bb4c94aadb52b4c9c9ef Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 27 Oct 2016 22:04:21 +0200
Subject: add krebs.tinc.*.hostsArchive

---
 krebs/3modules/retiolum.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'krebs/3modules/retiolum.nix')

diff --git a/krebs/3modules/retiolum.nix b/krebs/3modules/retiolum.nix
index fddaed9e3..ed99cc551 100644
--- a/krebs/3modules/retiolum.nix
+++ b/krebs/3modules/retiolum.nix
@@ -79,6 +79,15 @@ let
           '';
         };
 
+        hostsArchive = mkOption {
+          type = types.package;
+          default = pkgs.runCommand "retiolum-hosts.tar.bz2" {} ''
+            ${pkgs.coreutils}/bin/ln -s ${tinc.config.hostsPackage} hosts
+            ${pkgs.gnutar}/bin/tar -hcjf $out hosts
+          '';
+          readOnly = true;
+        };
+
         hostsPackage = mkOption {
           type = types.package;
           default = pkgs.stdenv.mkDerivation {
-- 
cgit v1.2.3


From 941fb77ae550beda1af873536f80ac2180a6afa9 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 10 Nov 2016 23:00:04 +0100
Subject: krebs.tinc.retiolum: update connectTo default

---
 krebs/3modules/retiolum.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'krebs/3modules/retiolum.nix')

diff --git a/krebs/3modules/retiolum.nix b/krebs/3modules/retiolum.nix
index ed99cc551..0a3d7ed2f 100644
--- a/krebs/3modules/retiolum.nix
+++ b/krebs/3modules/retiolum.nix
@@ -134,7 +134,11 @@ let
 
         connectTo = mkOption {
           type = types.listOf types.str;
-          default = [ "fastpoke" "cd" "prism" "gum" ];
+          ${if tinc.config.netname == "retiolum" then "default" else null} = [
+            "gum"
+            "ni"
+            "prism"
+          ];
           description = ''
             The list of hosts in the network which the client will try to connect
             to.  These hosts should have an 'Address' configured which points to a
-- 
cgit v1.2.3