Merge remote-tracking branch 'cd/master'

2016-11-10 23:04:44 +01:00 · 2016-11-10 23:04:44 +01:00 · 06d8bf1476
commit 06d8bf1476
parent 58ad30011d 941fb77ae5
1 changed files with 5 additions and 1 deletions
--- 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