From 30c9bd1b71a8d1a6ab0bf9915e3bfd6ca92098ec Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Sun, 10 Jul 2016 21:23:30 +0200 Subject: [PATCH] le client nix-serve change de serveur selon le domaine de la machine --- activation-manuelle/nix-serve-client.nix | 15 ++++++++++----- config-generator.nix | 1 + 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/activation-manuelle/nix-serve-client.nix b/activation-manuelle/nix-serve-client.nix index 51de09e..fb90bf3 100644 --- a/activation-manuelle/nix-serve-client.nix +++ b/activation-manuelle/nix-serve-client.nix @@ -1,9 +1,14 @@ -{ config, pkgs, ... }: - -{ - nix = pkgs.lib.mkIf config.r6d.config-generator.nix-serve-client { +{ config, lib, pkgs, ... }: +let + inherit (lib) mkIf mkMerge; + profiles = config.r6d.profiles; +in { + nix = mkIf config.r6d.config-generator.nix-serve-client { # Cache http pour le store requireSignedBinaryCaches = false; - binaryCaches = [ "http://192.168.10.169:5000" ]; + binaryCaches = [ + (mkIf profiles.isDubronetwork "http://192.168.10.169:5000") + (mkIf profiles.isPrunetwork "http://192.168.1.20:5000") + ]; }; } diff --git a/config-generator.nix b/config-generator.nix index 80ab493..44c2e52 100644 --- a/config-generator.nix +++ b/config-generator.nix @@ -90,6 +90,7 @@ in }) (mkIf pfl.isPrunetwork { r6d.config-generator.auto-upgrade = true; + r6d.config-generator.nix-serve-client = true; r6d.config-generator.swap = true; })