From 28092fb029dd3301bdbe5b18eb6d7a8020cb198e Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Thu, 26 Jan 2017 10:39:17 +0100 Subject: [PATCH 1/5] latitude sert son nix-store --- config-generator.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config-generator.nix b/config-generator.nix index 96d3a9d..1c75732 100644 --- a/config-generator.nix +++ b/config-generator.nix @@ -260,6 +260,7 @@ in ConnectTo = rollo_dubronetwork_fr ConnectTo = ocean_prunetwork_fr ''; + nix-serve-server = true; }; }) (mkIf comp.isMonstre { From 84802f8604939a7aae2ec799f00a386851b42ad0 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Thu, 26 Jan 2017 10:41:06 +0100 Subject: [PATCH 2/5] ajout hindent --- public/app-developpement-haskell.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/public/app-developpement-haskell.nix b/public/app-developpement-haskell.nix index 4ef8374..2b602b3 100644 --- a/public/app-developpement-haskell.nix +++ b/public/app-developpement-haskell.nix @@ -18,6 +18,7 @@ mkIf cfg.developpement-haskell { stack # pour les paquets en LTS de stackage haskellPackages.stylish-haskell # qualité de code + haskellPackages.hindent # Application perso haskellPackages.hahp From 11a69418a7d7eb1b2a1658bf66f3e0841e72ffae Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Fri, 27 Jan 2017 18:17:02 +0100 Subject: [PATCH 3/5] ajout machine hydra.prunetwork.fr --- config-generator.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/config-generator.nix b/config-generator.nix index 1c75732..1719a45 100644 --- a/config-generator.nix +++ b/config-generator.nix @@ -85,6 +85,7 @@ in }; #* Utilisé pour avoir des raccourcis de machine r6d.computers = { + isHydra = mkEnableOption "Identification du nom de machine."; isLatitude = mkEnableOption "Identification du nom de machine."; isMonstre = mkEnableOption "Identification du nom de machine."; isNeoNomade = mkEnableOption "Identification du nom de machine."; @@ -105,6 +106,7 @@ in { r6d.config-generator.enable = true; r6d.computers = { + isHydra = host == "hydra.prunetwork.fr"; isLatitude = host == "latitude.dubronetwork.fr"; isMonstre = host == "monstre.dubronetwork.fr"; isNeoNomade = host == "neo-nomade.dubronetwork.fr"; @@ -207,6 +209,20 @@ in ## Affectation des profils aux machines + (mkIf comp.isHydra { + r6d.profiles = { + isPrunetwork = true; + isServer = true; + }; + + r6d.config-generator = { + docker = true; + #tincAddress = "192.168.12.6/24"; + #tincExtraConfig = '' + # ConnectTo = rollo_dubronetwork_fr + # ''; + }; + }) (mkIf comp.isOcean { r6d.profiles = { isPrunetwork = true; From b4786c8fdfae6e96a4856149d26fa15fd6484780 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Fri, 27 Jan 2017 19:22:27 +0100 Subject: [PATCH 4/5] ajout de la clef ssh serveur de hydra --- public/service-hydra-core.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/public/service-hydra-core.nix b/public/service-hydra-core.nix index d76c55e..af4e999 100644 --- a/public/service-hydra-core.nix +++ b/public/service-hydra-core.nix @@ -73,6 +73,7 @@ mkIf cfg.hydra-core { ### Machines connues programs.ssh.knownHosts = { + "hydra.prunetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMhXFlj2oyArVyEwEwDxNXthB/JljHkq+UhTLxbekkMB"; "monstre.dubronetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBTTrLhq1Cwm0rpnwEIxSLqVrJWZnt+/9dt+SKd8NiIc"; "pedro.dubronetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7fjo2ysLqlfSo6BKnc6I6m1ayoPrbwEEyTKZmUzsOD"; "ocean.prunetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINCaRuTl8iCTUE4XInOpkSlwQj5Re4w4Iq+gNIlJe8pA"; From 0dab8286825aad9b3845dc2cb10c946726ccb214 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Fri, 27 Jan 2017 19:22:46 +0100 Subject: [PATCH 5/5] activation de hydra sur hydra.pru --- config-generator.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config-generator.nix b/config-generator.nix index 1719a45..83da13c 100644 --- a/config-generator.nix +++ b/config-generator.nix @@ -217,6 +217,8 @@ in r6d.config-generator = { docker = true; + hydra-builder = true; + hydra-core = true; #tincAddress = "192.168.12.6/24"; #tincExtraConfig = '' # ConnectTo = rollo_dubronetwork_fr