Merge remote-tracking branch 'cd/master'

This commit is contained in:
lassulus 2016-11-10 23:04:44 +01:00
commit 06d8bf1476

View File

@ -134,7 +134,11 @@ let
connectTo = mkOption { connectTo = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = [ "fastpoke" "cd" "prism" "gum" ]; ${if tinc.config.netname == "retiolum" then "default" else null} = [
"gum"
"ni"
"prism"
];
description = '' description = ''
The list of hosts in the network which the client will try to connect 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 to. These hosts should have an 'Address' configured which points to a