From 31f57965f9af5f76bece69922a253c75f0a912dd Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Sun, 30 Oct 2016 01:31:40 +0200 Subject: [PATCH] =?UTF-8?q?peers=20->=20extraconfig=20de=20tinc,=20pour=20?= =?UTF-8?q?=C3=AAtre=20plus=20souple?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config-generator.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/config-generator.nix b/config-generator.nix index eaf1da1..4eab55f 100644 --- a/config-generator.nix +++ b/config-generator.nix @@ -67,14 +67,13 @@ in description = "Adresse du noeud tinc local"; type = lib.types.string; }; - tincPeers = mkOption { + tincExtraConfig = mkOption { default = ""; example = '' - toto - foo - bar + Mode = router + ConnecTo = bar ''; - description = "Noeuds tinc auquels se connecter (ConnectTo)"; + description = "Configuration supplémentaire pour tinc"; type = lib.types.string; }; }; @@ -225,7 +224,7 @@ in r6d.config-generator = { laptop = true; tincAddress = "192.168.12.2/24"; - tincPeers = "phenom_dubronetwork_fr"; + tincExtraConfig = "ConnectTo = phenom_dubronetwork_fr"; }; }) (mkIf comp.isMonstre {