From 7cb371510b14e91be5b1ea978c22d8fc92c009af Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Thu, 11 Aug 2016 23:47:50 +0200 Subject: [PATCH] =?UTF-8?q?ajustement=20des=20r=C3=A8gles=20d'utilisation?= =?UTF-8?q?=20du=20cache?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base/activation-manuelle/nix-serve-client.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/base/activation-manuelle/nix-serve-client.nix b/base/activation-manuelle/nix-serve-client.nix index fa83547..d8fcb74 100644 --- a/base/activation-manuelle/nix-serve-client.nix +++ b/base/activation-manuelle/nix-serve-client.nix @@ -5,20 +5,20 @@ let profiles = config.r6d.profiles; cfg = config.r6d.config-generator; computers = config.r6d.computers; -in { - nix = mkIf config.r6d.config-generator.nix-serve-client { +in + +mkIf cfg.nix-serve-client { + nix = { # Cache http pour le store requireSignedBinaryCaches = false; binaryCaches = [ - ("https://cache.nixos.org/") - (mkIf (profiles.isDubronetwork && (! computers.isMonstre)) "http://192.168.10.169:5000") - (mkIf profiles.isDubronetwork "http://192.168.10.252:5000") + "https://cache.nixos.org/" + (mkIf (profiles.isDubronetwork && (! computers.isRollo)) "http://nix-cache.dubronetwork.fr:5001") (mkIf (profiles.isPrunetwork && !profiles.isServer) "http://192.168.1.20:5000") ]; extraOptions = '' - connect-timeout = 5 + connect-timeout = 5 ''; - }; - - } + }; +}