Compare commits

...

7 Commits

2 changed files with 14 additions and 4 deletions

View File

@@ -13,6 +13,11 @@ mkIf cfg.nix-serve-client {
# Cache http pour le store # Cache http pour le store
requireSignedBinaryCaches = false; requireSignedBinaryCaches = false;
binaryCaches = [ binaryCaches = [
#(mkIf (computers.isRollo) "http://ocean.grudu.net:5001/")
(mkIf (computers.isRollo) "http://192.168.12.6:5000/")
#(mkIf (computers.isOcean) "http://rollo.grudu.net:5001/")
(mkIf (computers.isOcean) "http://192.168.12.5:5000/")
(mkIf (profiles.isDubronetwork && (! computers.isPedro) && (! computers.isRollo)) "http://nix-cache.dubronetwork.fr:5001") (mkIf (profiles.isDubronetwork && (! computers.isPedro) && (! computers.isRollo)) "http://nix-cache.dubronetwork.fr:5001")
(mkIf profiles.isPrunetwork "https://cache.nixos.org/") (mkIf profiles.isPrunetwork "https://cache.nixos.org/")

View File

@@ -219,10 +219,11 @@ in
docker = true; docker = true;
hydra-builder = true; hydra-builder = true;
hydra-core = true; hydra-core = true;
#tincAddress = "192.168.12.6/24"; tincAddress = "192.168.12.8/24";
#tincExtraConfig = '' tincExtraConfig = ''
# ConnectTo = rollo_dubronetwork_fr ConnectTo = rollo_dubronetwork_fr
# ''; ConnectTo = ocean_prunetwork_fr
'';
}; };
}) })
(mkIf comp.isOcean { (mkIf comp.isOcean {
@@ -234,6 +235,8 @@ in
r6d.config-generator = { r6d.config-generator = {
docker = true; docker = true;
radicale = true; radicale = true;
nix-serve-client = true;
nix-serve-server = true;
tincAddress = "192.168.12.6/24"; tincAddress = "192.168.12.6/24";
tincExtraConfig = '' tincExtraConfig = ''
ConnectTo = rollo_dubronetwork_fr ConnectTo = rollo_dubronetwork_fr
@@ -364,6 +367,8 @@ in
fail2ban = true; fail2ban = true;
mailboxes = true; mailboxes = true;
murmur = true; murmur = true;
nix-serve-client = true;
nix-serve-server = true;
tincAddress = "192.168.12.5/24"; tincAddress = "192.168.12.5/24";
tincExtraConfig = '' tincExtraConfig = ''
ConnectTo = ocean_prunetwork_fr ConnectTo = ocean_prunetwork_fr