From f6321935589b7c80efaa64a00270310ec4fc885f Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Sun, 1 Jan 2017 18:23:59 +0100 Subject: [PATCH] =?UTF-8?q?cr=C3=A9ation=20profil=20prunetwork=20&&=20work?= =?UTF-8?q?station?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config-generator.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/config-generator.nix b/config-generator.nix index efb1065..1fbbd20 100644 --- a/config-generator.nix +++ b/config-generator.nix @@ -183,11 +183,21 @@ in (mkIf pfl.isPrunetwork { r6d.config-generator = { auto-upgrade = true; + docker = true; locate = true; fail2ban = true; swap = true; }; }) + (mkIf (pfl.isPrunetwork && pfl.isWorkstation) { + r6d.config-generator = { + developpement = true; + developpement-haskell = true; + developpement-java = true; + print = true; + virtualbox = true; + }; + }) ## Affectation des profils aux machines @@ -198,7 +208,6 @@ in }; r6d.config-generator = { - docker = true; radicale = true; tincAddress = "192.168.12.6/24"; tincExtraConfig = '' @@ -214,14 +223,10 @@ in }; r6d.config-generator = { - developpement = true; - developpement-haskell = true; - developpement-java = true; elasticsearch = true; hydra-builder = true; hydra-core = true; kibana = true; - print = true; rabbitmq = true; tincAddress = "192.168.12.3/24"; tincExtraConfig = '' @@ -229,7 +234,6 @@ in ConnectTo = rollo_dubronetwork_fr ConnectTo = ocean_prunetwork_fr ''; - virtualbox = true; }; })