From 758e8ba84a40691c6584af8889a99260dbd20019 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Sun, 16 Oct 2016 01:08:04 +0200 Subject: [PATCH 01/34] MaJ des nom de paquets (cf. release note) --- public/app-client-internet.nix | 2 +- public/app-developpement.nix | 2 +- public/environment.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/app-client-internet.nix b/public/app-client-internet.nix index 90b9211..f098f35 100644 --- a/public/app-client-internet.nix +++ b/public/app-client-internet.nix @@ -25,7 +25,7 @@ environment.systemPackages = with pkgs; [ ## Mail & Discussion (texte, audio) clawsMail hexchat - kde5.quasselClient + quasselClient mumble mutt pidgin diff --git a/public/app-developpement.nix b/public/app-developpement.nix index 4afe3d5..4fbf463 100644 --- a/public/app-developpement.nix +++ b/public/app-developpement.nix @@ -38,7 +38,7 @@ mkIf cfg.developpement { ## Rust cargo # récupération des dépendances + compilation projet rust - rustPlatform.rustc # pour les appels depuis les scripts + rustc # pour les appels depuis les scripts ## Visualisation & outils de diff gource # visualisation en mouvement de l'historique git diff --git a/public/environment.nix b/public/environment.nix index 916650e..84747e8 100644 --- a/public/environment.nix +++ b/public/environment.nix @@ -12,7 +12,7 @@ in nix.buildCores = 0; # The NixOS release to be compatible with for stateful data such as databases. - system.stateVersion = "16.03"; + system.stateVersion = "16.09"; # copies the NixOS configuration file (usually /etc/nixos/configuration.nix) and links it from the resulting system (getting to /run/current-system/configuration.nix) system.copySystemConfiguration = true; From 4b5eacda0fc9d629fac1c140e8b1c1130cc84a98 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Sun, 16 Oct 2016 01:39:26 +0200 Subject: [PATCH 02/34] =?UTF-8?q?x11:=20param=C3=A8tres=20non=20n=C3=A9ces?= =?UTF-8?q?saires=20car=20les=20valeurs=20par=20d=C3=A9faut=20sont=20OK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/service-x11.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/public/service-x11.nix b/public/service-x11.nix index b92b0e4..a64b168 100644 --- a/public/service-x11.nix +++ b/public/service-x11.nix @@ -17,8 +17,6 @@ mkIf profiles.isDesktop { xkbOptions = "eurosign:e"; displayManager.lightdm.enable = true; windowManager.awesome.enable = true; - startGnuPGAgent = true; - startOpenSSHAgent = false; # pas compatible avec l'agent GnuPG inputClassSections = ['' Identifier "Marble Mouse" MatchProduct "Logitech USB Trackball" From 807b1bc2e627fe706f4624fda342aed0d8424936 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Sun, 16 Oct 2016 17:28:48 +0200 Subject: [PATCH 03/34] activation dbus --- public/environment.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/environment.nix b/public/environment.nix index 84747e8..0e7db1b 100644 --- a/public/environment.nix +++ b/public/environment.nix @@ -20,6 +20,9 @@ in # On autorise les paquets non-libres nixpkgs.config.allowUnfree = true; + # Lancement de dbus pour les utilisateurs + services.dbus.socketActivated = true; + # Paquets environment = { systemPackages = with pkgs; [ From 821d46befeda48a493bcca07228747372f16ce42 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Mon, 17 Oct 2016 09:29:21 +0200 Subject: [PATCH 04/34] =?UTF-8?q?d=C3=A9sactivation=20par=20d=C3=A9faut=20?= =?UTF-8?q?de=20x11=20:=20doit=20=C3=AAtre=20explicitement=20appel=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/service-x11.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/service-x11.nix b/public/service-x11.nix index a64b168..93e8b16 100644 --- a/public/service-x11.nix +++ b/public/service-x11.nix @@ -12,7 +12,7 @@ mkIf profiles.isDesktop { # Services # Enable the X11 windowing system. services.xserver = { - enable = true; + #enable = true; layout = "fr"; xkbOptions = "eurosign:e"; displayManager.lightdm.enable = true; From 4fbf145c78c8fd0ac5bc61b0c3edb37b7451d569 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Mon, 17 Oct 2016 09:29:47 +0200 Subject: [PATCH 05/34] ajout README --- README.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..2e7262c --- /dev/null +++ b/README.md @@ -0,0 +1,27 @@ +# Notes pour l'upgrade + +* mettre le dépôt base sur la branche upgrade-16.09 +* activer x11 dans le configuration.nix + +~~~ +services.xserver.enable = true; +~~~ + +* remplacer le bootloader + +~~~ +boot.loader.gummiboot.enable = true; +~~~ + +devient + +~~~ +boot.loader.systemd-boot.enable = true; +~~~ + +Pour résoudre les soucis d'upgrade, il est conseillé : +* de désactiver tous les imports (sauf `hardware.nix`) +* d'ajouter `.../localisation.nix` dans les imports sous peine d'être en clavier US +* d'ajouter ```nixpkgs.config.allowUnfree = true;``` +* de réactiver petit à petit les lignes désactivées + From 04038a7b16cc5115689d645e8c23c843cf13c0c8 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Mon, 17 Oct 2016 09:46:53 +0200 Subject: [PATCH 06/34] fusion des dichiers README (oups) --- README | 29 +++++++++++++++++++++++++++++ README.md | 27 --------------------------- 2 files changed, 29 insertions(+), 27 deletions(-) delete mode 100644 README.md diff --git a/README b/README index e057167..1ae9b2c 100644 --- a/README +++ b/README @@ -9,3 +9,32 @@ Actuellement, les scripts contiennent un peu de configuration spécifique pour l * https://nixos.org/wiki/How_to_install_NixOS_from_Linux#Installing_through_a_chroot * https://github.com/NixOS/nixpkgs/issues/13305 + +# Notes pour l'upgrade de 16.03 vers 16.09 + +* mettre le dépôt base sur la branche upgrade-16.09 +* activer x11 dans le configuration.nix + +~~~ +services.xserver.enable = true; +~~~ + +* remplacer le bootloader + +~~~ +boot.loader.gummiboot.enable = true; +~~~ + +devient + +~~~ +boot.loader.systemd-boot.enable = true; +~~~ + +Pour résoudre les soucis d'upgrade, il est conseillé : +* de désactiver tous les imports (sauf `hardware.nix`) +* d'ajouter `.../localisation.nix` dans les imports sous peine d'être en clavier US +* d'ajouter ```nixpkgs.config.allowUnfree = true;``` +* d'ajouter `vim` aux paquets +* de réactiver petit à petit les lignes désactivées + diff --git a/README.md b/README.md deleted file mode 100644 index 2e7262c..0000000 --- a/README.md +++ /dev/null @@ -1,27 +0,0 @@ -# Notes pour l'upgrade - -* mettre le dépôt base sur la branche upgrade-16.09 -* activer x11 dans le configuration.nix - -~~~ -services.xserver.enable = true; -~~~ - -* remplacer le bootloader - -~~~ -boot.loader.gummiboot.enable = true; -~~~ - -devient - -~~~ -boot.loader.systemd-boot.enable = true; -~~~ - -Pour résoudre les soucis d'upgrade, il est conseillé : -* de désactiver tous les imports (sauf `hardware.nix`) -* d'ajouter `.../localisation.nix` dans les imports sous peine d'être en clavier US -* d'ajouter ```nixpkgs.config.allowUnfree = true;``` -* de réactiver petit à petit les lignes désactivées - From 51dd0b65f4b5c6cce31cc69e19bf11c16bb62f78 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Mon, 17 Oct 2016 10:06:24 +0200 Subject: [PATCH 07/34] =?UTF-8?q?correction=20r=C3=A9gression=20sur=20host?= =?UTF-8?q?name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/network.nix | 18 ++++++++++++++++++ public/public.nix | 1 + 2 files changed, 19 insertions(+) create mode 100644 public/network.nix diff --git a/public/network.nix b/public/network.nix new file mode 100644 index 0000000..cd89819 --- /dev/null +++ b/public/network.nix @@ -0,0 +1,18 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkIf mkMerge mkThenElse; + cfg = config.r6d.config-generator; + computers = config.r6d.computers; + profiles = config.r6d.profiles; +in + +mkIf true { + + # fix: Hostname -s renvoie "Unknown host" alors que hostname renvoie la bonne valeur + # Il s'avère que hostname vérifie la validité du FQDN et du reverse. + # Fixer ces paramètres dans les hosts permet de faire tomber en marche + networking.extraHosts = '' + 127.0.0.1 ${config.networking.hostName} + ''; +} diff --git a/public/public.nix b/public/public.nix index 2e0eaf7..7dc042f 100644 --- a/public/public.nix +++ b/public/public.nix @@ -12,6 +12,7 @@ in # installées systématiquement ./environment.nix ./localisation.nix + ./network.nix #./network-ipv6.nix ./sudo.nix ./service-haveged.nix From 95e868760966a5d45c8aa6b4a52bd4500fcc9c01 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Mon, 17 Oct 2016 10:19:21 +0200 Subject: [PATCH 08/34] =?UTF-8?q?pr=C3=A9cision=20sur=20le=20channel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README | 1 + 1 file changed, 1 insertion(+) diff --git a/README b/README index 1ae9b2c..bb3733f 100644 --- a/README +++ b/README @@ -14,6 +14,7 @@ Actuellement, les scripts contiennent un peu de configuration spécifique pour l * mettre le dépôt base sur la branche upgrade-16.09 * activer x11 dans le configuration.nix +* changer le channel nixos : ```nix-channel --add https://nixos.org/channels/nixos-16.09 nixos``` ~~~ services.xserver.enable = true; From a5aae179a23a42d35afaa23e59cb42e81e772af8 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Mon, 17 Oct 2016 08:25:22 +0000 Subject: [PATCH 09/34] =?UTF-8?q?Mettre=20=C3=A0=20jour=20'README.md'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README => README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename README => README.md (100%) diff --git a/README b/README.md similarity index 100% rename from README rename to README.md From 3a8a728268b7f9f91eb045978c0ef529604f30a5 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Mon, 17 Oct 2016 11:21:05 +0200 Subject: [PATCH 10/34] =?UTF-8?q?lors=20d'une=20full-auto,=20on=20ne=20for?= =?UTF-8?q?ce=20pas=20=C3=A0=20=C3=AAtre=20sur=20la=20branche=20master?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bb2333f..8aec7b1 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ push: submodules-push submodules-update: #git submodule update --remote - git submodule foreach git co master + #git submodule foreach git co master git submodule foreach git ff submodules-push: From 21d7c97c767d481f8a8e030231ad6245130a14c5 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Mon, 17 Oct 2016 12:54:27 +0200 Subject: [PATCH 11/34] readme: ajustement sur le bootloader --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bb3733f..6e04aef 100644 --- a/README.md +++ b/README.md @@ -13,14 +13,14 @@ Actuellement, les scripts contiennent un peu de configuration spécifique pour l # Notes pour l'upgrade de 16.03 vers 16.09 * mettre le dépôt base sur la branche upgrade-16.09 -* activer x11 dans le configuration.nix * changer le channel nixos : ```nix-channel --add https://nixos.org/channels/nixos-16.09 nixos``` +* activer x11 dans le configuration.nix ~~~ services.xserver.enable = true; ~~~ -* remplacer le bootloader +* remplacer le bootloader si gummiboot était utilisé ~~~ boot.loader.gummiboot.enable = true; From 99d5886affe26f2270faabb768d1dc69dc473031 Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Tue, 18 Oct 2016 12:15:41 +0200 Subject: [PATCH 12/34] suelette de config hydra --- config-generator.nix | 2 ++ public/hydra.nix | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 public/hydra.nix diff --git a/config-generator.nix b/config-generator.nix index ff07362..9c16c19 100644 --- a/config-generator.nix +++ b/config-generator.nix @@ -42,6 +42,8 @@ in edition-photo = mkEnableOption "Profil pour la création/édition de photos."; edition-video = mkEnableOption "Profil pour la création/édition de video."; fail2ban = mkEnableOption "Profil pour activer Fail2ban."; + hydra-builder = mkEnableOption "Profil pour une machine qui compile pour hydra."; + hydra-server = mkEnableOption "Profil pour un serveur hydra."; jeux = mkEnableOption "Profil pour les jeux vidéos."; laptop = mkEnableOption "Profil pour les outils spécifiques aux ordinateurs portables.."; locate = mkEnableOption "Profil pour activer la fonction locate."; diff --git a/public/hydra.nix b/public/hydra.nix new file mode 100644 index 0000000..253902a --- /dev/null +++ b/public/hydra.nix @@ -0,0 +1,34 @@ +{ config, pkgs, ... }: + +{ + ####################################### HYDRA + + virtualisation.virtualbox.host.enable = true; + + # une fois installé : + # 1. créer chef SSH : ssh-keygen -C "hydra@pedro.dubronetwork.fr" -N "" -f /etc/nixos/id_buildfarm + # 2. récupérer la clef publique du serveur ssh : ssh-keyscan localhost + l'ajouter dans les knownHosts + # 2. créer un utilisateur + # su - hydra + # hydra-create-user jpierre03 --password toto --role 'admin' + # accessible à hydra.pedro.dubnronetwork.fr + services.hydra = { + enable = true; + hydraURL = "http://hydra.pedro.dubronetwork.fr"; + notificationSender = "hydra@${config.networking.hostName}"; + listenHost = "localhost"; + minimumDiskFree = 50; # Go + }; + + programs.ssh.knownHosts."pedro.dubronetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7fjo2ysLqlfSo6BKnc6I6m1ayoPrbwEEyTKZmUzsOD"; + nix = { + distributedBuilds = true; + buildMachines = [ + { hostName = "pedro.dubronetwork.fr"; maxJobs = 2; speedFactor = 10; sshKey = "/etc/nixos/id_buildfarm"; sshUser = "root"; system = "x86_64-linux"; } + ]; + extraOptions = "auto-optimise-store = true"; + }; + # nix.gc = { + # automatic = true; + #}; +} From 46e61f0fed516f27f8121269d3cea78edc28c244 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Tue, 18 Oct 2016 12:59:14 +0200 Subject: [PATCH 13/34] config hydra TMP --- public/hydra.nix | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 public/hydra.nix diff --git a/public/hydra.nix b/public/hydra.nix new file mode 100644 index 0000000..253902a --- /dev/null +++ b/public/hydra.nix @@ -0,0 +1,34 @@ +{ config, pkgs, ... }: + +{ + ####################################### HYDRA + + virtualisation.virtualbox.host.enable = true; + + # une fois installé : + # 1. créer chef SSH : ssh-keygen -C "hydra@pedro.dubronetwork.fr" -N "" -f /etc/nixos/id_buildfarm + # 2. récupérer la clef publique du serveur ssh : ssh-keyscan localhost + l'ajouter dans les knownHosts + # 2. créer un utilisateur + # su - hydra + # hydra-create-user jpierre03 --password toto --role 'admin' + # accessible à hydra.pedro.dubnronetwork.fr + services.hydra = { + enable = true; + hydraURL = "http://hydra.pedro.dubronetwork.fr"; + notificationSender = "hydra@${config.networking.hostName}"; + listenHost = "localhost"; + minimumDiskFree = 50; # Go + }; + + programs.ssh.knownHosts."pedro.dubronetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7fjo2ysLqlfSo6BKnc6I6m1ayoPrbwEEyTKZmUzsOD"; + nix = { + distributedBuilds = true; + buildMachines = [ + { hostName = "pedro.dubronetwork.fr"; maxJobs = 2; speedFactor = 10; sshKey = "/etc/nixos/id_buildfarm"; sshUser = "root"; system = "x86_64-linux"; } + ]; + extraOptions = "auto-optimise-store = true"; + }; + # nix.gc = { + # automatic = true; + #}; +} From 2d770067b7bbd9d31120b83a67a9a0f5da0644cc Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Tue, 18 Oct 2016 13:03:49 +0200 Subject: [PATCH 14/34] hydra: ajout options pour les profils hydra --- config-generator.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config-generator.nix b/config-generator.nix index ff07362..f4931b2 100644 --- a/config-generator.nix +++ b/config-generator.nix @@ -42,6 +42,8 @@ in edition-photo = mkEnableOption "Profil pour la création/édition de photos."; edition-video = mkEnableOption "Profil pour la création/édition de video."; fail2ban = mkEnableOption "Profil pour activer Fail2ban."; + hydra-builder = mkEnableOption "Profil pour une machine qui compile pour hydra."; + hydra-core = mkEnableOption "Profil pour un serveur hydra."; jeux = mkEnableOption "Profil pour les jeux vidéos."; laptop = mkEnableOption "Profil pour les outils spécifiques aux ordinateurs portables.."; locate = mkEnableOption "Profil pour activer la fonction locate."; @@ -181,6 +183,7 @@ in }; r6d.config-generator = { + hydra-core = true; print = true; virtualbox = true; }; From e2e15cad3964c243ea8a8c2910a727dcd119795b Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Tue, 18 Oct 2016 13:05:46 +0200 Subject: [PATCH 15/34] =?UTF-8?q?hydra:=20ajout=20config=20core=20&=20buil?= =?UTF-8?q?der=20(pas=20test=C3=A9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/public.nix | 2 ++ public/service-hydra-build.nix | 31 ++++++++++++++++++ public/service-hydra-core.nix | 58 ++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+) create mode 100644 public/service-hydra-build.nix create mode 100644 public/service-hydra-core.nix diff --git a/public/public.nix b/public/public.nix index 7dc042f..2d43287 100644 --- a/public/public.nix +++ b/public/public.nix @@ -34,6 +34,8 @@ in ./auto-upgrade.nix # mise à jour automatique du système ./laptop.nix # appli & configuration adaptée pour un PC portable ./print.nix # configuration de base de cups + ./service-hydra-build.nix # service de construction de paquet. -> la machine compile des paquets + ./service-hydra-core.nix # service pour l'instance d'hydra ./service-laptop.nix # services spécifiques aux pc portables ./service-locate.nix # service locate ./swap.nix # définition de l'utilisation du swap diff --git a/public/service-hydra-build.nix b/public/service-hydra-build.nix new file mode 100644 index 0000000..e58b472 --- /dev/null +++ b/public/service-hydra-build.nix @@ -0,0 +1,31 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkIf mkMerge mkThenElse; + cfg = config.r6d.config-generator; + computers = config.r6d.computers; + profiles = config.r6d.profiles; +in + +mkIf cfg.hydra-builder { + + # Paquets + environment.systemPackages = with pkgs; [ + ]; + + # Services + + + virtualisation.virtualbox.host.enable = true; + nix.gc.automatic = true; + + users.users."hydrabuild" = { + description = "Execution des job hydra"; + group = ["nixbld"]; + isNormalUser = false; + + openssh.authorizedKeys.keys = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVMndtLDf++di38EE8rEG5QOCA5aKsBO/f0LIi1Ez87ZaNsjv9XvJW1f8Nt6KH+lSvB1Cp7QCRINawLavb714oZ248cuAu1Osq8lMSDnQlGqgJa+cgiww7PPvJU9YLkrx5LT0Suaskp64Iq4Ox1n+2zy2pIiFD/9Ueqmrt9GnztdQkkqYsGYMjNjY2PBFrkeCWhib9Y3t1eeWsugkegbNVFJtdU2AeqBiDT41dCne6WBJBoDy7wtP3a8ocYMv4G2ThUzLx0SOY5sDUTEQKgm7ncp4FRBSQBOiz1VanFrimKhNKtomY7Da8Ls31LpbDdnI6sauuSUtOvYb+h5QvWeFl root@pedro.dubronetwork.fr" + ]; + }; +} diff --git a/public/service-hydra-core.nix b/public/service-hydra-core.nix new file mode 100644 index 0000000..b60ee49 --- /dev/null +++ b/public/service-hydra-core.nix @@ -0,0 +1,58 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkIf mkMerge mkThenElse; + cfg = config.r6d.config-generator; + computers = config.r6d.computers; + profiles = config.r6d.profiles; +in + +mkIf cfg.hydra-core { + + # Paquets + environment.systemPackages = with pkgs; [ + ]; + + # Services + + ## Hydra + # 2. créer un utilisateur pour gérer hydra + # su - hydra + # hydra-create-user jpierre03 --password xxx --role 'admin' + + services.hydra = { + enable = true; + hydraURL = "http://hydra.${config.networking.hostName}"; + notificationSender = "hydra@${config.networking.hostName}"; + listenHost = "localhost"; + minimumDiskFree = 50; # Go + }; + + ## Ménage + nix.gc = { + automatic = true; + }; + + ## Délégation des actions de compilation à la compilefarm + + ### Machines connues + # 2. récupérer la clef publique du serveur ssh : ssh-keyscan localhost + l'ajouter dans les knownHosts + + programs.ssh.knownHosts = { + "pedro.dubronetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7fjo2ysLqlfSo6BKnc6I6m1ayoPrbwEEyTKZmUzsOD"; + }; + + # une fois installé : + # 1. créer chef SSH : ssh-keygen -C "hydra@pedro.dubronetwork.fr" -N "" -f /etc/nixos/id_buildfarm + # accessible à hydra.pedro.dubnronetwork.fr + + + nix = { + distributedBuilds = true; + buildMachines = [ + # { hostName = "pedro.dubronetwork.fr"; maxJobs = 2; speedFactor = 10; sshKey = "/etc/nixos/id_buildfarm"; sshUser = "root"; system = "x86_64-linux"; } + ]; + extraOptions = "auto-optimise-store = true"; + }; + +} From 7dbfccf2f4e557717817715d9ea137236fc155a2 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Tue, 18 Oct 2016 13:12:10 +0200 Subject: [PATCH 16/34] =?UTF-8?q?hydra:=20d=C3=A9sactivation=20gc=20car=20?= =?UTF-8?q?conflit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/service-hydra-core.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/public/service-hydra-core.nix b/public/service-hydra-core.nix index b60ee49..8f26062 100644 --- a/public/service-hydra-core.nix +++ b/public/service-hydra-core.nix @@ -29,9 +29,7 @@ mkIf cfg.hydra-core { }; ## Ménage - nix.gc = { - automatic = true; - }; + #nix.gc.automatic = true; ## Délégation des actions de compilation à la compilefarm From 2ffdaf0a537e123ca8e81a7448cedf17b7c17f40 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Tue, 18 Oct 2016 13:13:30 +0200 Subject: [PATCH 17/34] Revert "suelette de config hydra" This reverts commit 99d5886affe26f2270faabb768d1dc69dc473031. --- config-generator.nix | 2 -- public/hydra.nix | 34 ---------------------------------- 2 files changed, 36 deletions(-) delete mode 100644 public/hydra.nix diff --git a/config-generator.nix b/config-generator.nix index 9c16c19..ff07362 100644 --- a/config-generator.nix +++ b/config-generator.nix @@ -42,8 +42,6 @@ in edition-photo = mkEnableOption "Profil pour la création/édition de photos."; edition-video = mkEnableOption "Profil pour la création/édition de video."; fail2ban = mkEnableOption "Profil pour activer Fail2ban."; - hydra-builder = mkEnableOption "Profil pour une machine qui compile pour hydra."; - hydra-server = mkEnableOption "Profil pour un serveur hydra."; jeux = mkEnableOption "Profil pour les jeux vidéos."; laptop = mkEnableOption "Profil pour les outils spécifiques aux ordinateurs portables.."; locate = mkEnableOption "Profil pour activer la fonction locate."; diff --git a/public/hydra.nix b/public/hydra.nix deleted file mode 100644 index 253902a..0000000 --- a/public/hydra.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ config, pkgs, ... }: - -{ - ####################################### HYDRA - - virtualisation.virtualbox.host.enable = true; - - # une fois installé : - # 1. créer chef SSH : ssh-keygen -C "hydra@pedro.dubronetwork.fr" -N "" -f /etc/nixos/id_buildfarm - # 2. récupérer la clef publique du serveur ssh : ssh-keyscan localhost + l'ajouter dans les knownHosts - # 2. créer un utilisateur - # su - hydra - # hydra-create-user jpierre03 --password toto --role 'admin' - # accessible à hydra.pedro.dubnronetwork.fr - services.hydra = { - enable = true; - hydraURL = "http://hydra.pedro.dubronetwork.fr"; - notificationSender = "hydra@${config.networking.hostName}"; - listenHost = "localhost"; - minimumDiskFree = 50; # Go - }; - - programs.ssh.knownHosts."pedro.dubronetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7fjo2ysLqlfSo6BKnc6I6m1ayoPrbwEEyTKZmUzsOD"; - nix = { - distributedBuilds = true; - buildMachines = [ - { hostName = "pedro.dubronetwork.fr"; maxJobs = 2; speedFactor = 10; sshKey = "/etc/nixos/id_buildfarm"; sshUser = "root"; system = "x86_64-linux"; } - ]; - extraOptions = "auto-optimise-store = true"; - }; - # nix.gc = { - # automatic = true; - #}; -} From 6800de18af0f3cfa835f682c0a1799a1c6d455cb Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Tue, 18 Oct 2016 13:40:30 +0200 Subject: [PATCH 18/34] ajout des clef publiques des serveurs --- public/service-hydra-core.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/public/service-hydra-core.nix b/public/service-hydra-core.nix index 8f26062..d51b10c 100644 --- a/public/service-hydra-core.nix +++ b/public/service-hydra-core.nix @@ -37,13 +37,16 @@ mkIf cfg.hydra-core { # 2. récupérer la clef publique du serveur ssh : ssh-keyscan localhost + l'ajouter dans les knownHosts programs.ssh.knownHosts = { - "pedro.dubronetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7fjo2ysLqlfSo6BKnc6I6m1ayoPrbwEEyTKZmUzsOD"; + "monstre.dubronetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBTTrLhq1Cwm0rpnwEIxSLqVrJWZnt+/9dt+SKd8NiIc"; + "pedro.dubronetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7fjo2ysLqlfSo6BKnc6I6m1ayoPrbwEEyTKZmUzsOD"; + "ocean.prunetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINCaRuTl8iCTUE4XInOpkSlwQj5Re4w4Iq+gNIlJe8pA"; + "radx.prunetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGyoXdTEnxSgZTMfRfVH+bpOGZJtJpydAijcRGsZik7U"; + "rollo.dubronetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID4lWgS/sVdcZvnAAN+lBSOcCL9ISdAUsjp1kh9lalNu"; }; # une fois installé : # 1. créer chef SSH : ssh-keygen -C "hydra@pedro.dubronetwork.fr" -N "" -f /etc/nixos/id_buildfarm # accessible à hydra.pedro.dubnronetwork.fr - nix = { distributedBuilds = true; From bd0076b9d19c69ce0735cc9b177c89ccb95ef8db Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Tue, 18 Oct 2016 13:53:50 +0200 Subject: [PATCH 19/34] MaJ commande ssh --- 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 d51b10c..c34249a 100644 --- a/public/service-hydra-core.nix +++ b/public/service-hydra-core.nix @@ -46,6 +46,7 @@ mkIf cfg.hydra-core { # une fois installé : # 1. créer chef SSH : ssh-keygen -C "hydra@pedro.dubronetwork.fr" -N "" -f /etc/nixos/id_buildfarm + # ssh-keygen -t ed25519 -C "hydra MACHINE" -f /etc/nixos/hydra-ssh-key # accessible à hydra.pedro.dubnronetwork.fr nix = { From 7dada8a3e6303abcebfe2bd42968aa1e800235dc Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Tue, 18 Oct 2016 14:03:33 +0200 Subject: [PATCH 20/34] fix: erreur de type (string et non array) --- config-generator.nix | 1 + public/service-hydra-build.nix | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config-generator.nix b/config-generator.nix index f4931b2..8f88131 100644 --- a/config-generator.nix +++ b/config-generator.nix @@ -183,6 +183,7 @@ in }; r6d.config-generator = { + hydra-builder = true; hydra-core = true; print = true; virtualbox = true; diff --git a/public/service-hydra-build.nix b/public/service-hydra-build.nix index e58b472..c5b681a 100644 --- a/public/service-hydra-build.nix +++ b/public/service-hydra-build.nix @@ -21,11 +21,11 @@ mkIf cfg.hydra-builder { users.users."hydrabuild" = { description = "Execution des job hydra"; - group = ["nixbld"]; + group = "nixbld"; isNormalUser = false; openssh.authorizedKeys.keys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVMndtLDf++di38EE8rEG5QOCA5aKsBO/f0LIi1Ez87ZaNsjv9XvJW1f8Nt6KH+lSvB1Cp7QCRINawLavb714oZ248cuAu1Osq8lMSDnQlGqgJa+cgiww7PPvJU9YLkrx5LT0Suaskp64Iq4Ox1n+2zy2pIiFD/9Ueqmrt9GnztdQkkqYsGYMjNjY2PBFrkeCWhib9Y3t1eeWsugkegbNVFJtdU2AeqBiDT41dCne6WBJBoDy7wtP3a8ocYMv4G2ThUzLx0SOY5sDUTEQKgm7ncp4FRBSQBOiz1VanFrimKhNKtomY7Da8Ls31LpbDdnI6sauuSUtOvYb+h5QvWeFl root@pedro.dubronetwork.fr" - ]; + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGYpjcWJCf8dXpv2LmoIaNVbwZXEC50QUU6Az+lqeD89 hydra radx" + ]; }; } From d6bfe1c7065e58aa65aa3df56fbc5faf9bad9684 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Tue, 18 Oct 2016 15:23:23 +0200 Subject: [PATCH 21/34] pinentry --- public/environment.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/public/environment.nix b/public/environment.nix index 0e7db1b..558f019 100644 --- a/public/environment.nix +++ b/public/environment.nix @@ -42,6 +42,7 @@ in p7zip # compression de fichier parted # partitionnement de disque pciutils + pinentry # pour taper les mots de passe gpg psmisc # fournis les utilitaires comme killall, fuser, pstree python # python -- python -m SimpleHTTPServer 8000 python34Packages.glances # monitoring From ed5420e1b0f68c68199604fec704c8477430e125 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Thu, 20 Oct 2016 23:56:29 +0200 Subject: [PATCH 22/34] ajout option pour radicale --- config-generator.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config-generator.nix b/config-generator.nix index 8f88131..4bb9b9e 100644 --- a/config-generator.nix +++ b/config-generator.nix @@ -55,6 +55,7 @@ in online-ipv6 = mkEnableOption "Profil pour activer l'IPv6 de online.net"; print = mkEnableOption "Profil pour activer cups & pouvoir imprimer."; rabbitmq = mkEnableOption "Profil pour activer le service de messagerie AMQP."; + radicale = mkEnableOption "Profil pour activer le service d'hébergement de calendrier + tâches & contacts."; swap = mkEnableOption "Profil pour que le swap soit activé."; virtualbox = mkEnableOption "Profil pour l'utilisation de VirtualBox."; xmonad = mkEnableOption "Profil pour activer le gestionnaire de fenêtres xmonad."; From 7d28694819dc7b97663c256f48afcc40e2a3f79e Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Thu, 20 Oct 2016 23:56:43 +0200 Subject: [PATCH 23/34] ocean: activation radicale --- config-generator.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config-generator.nix b/config-generator.nix index 4bb9b9e..2ea0fa1 100644 --- a/config-generator.nix +++ b/config-generator.nix @@ -174,6 +174,7 @@ in r6d.config-generator = { docker = true; + radicale = true; }; }) (mkIf comp.isRadx { From dba3a46ebd5713e811b02ffe0e1b4d8fb441a14e Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Sat, 22 Oct 2016 15:37:20 +0200 Subject: [PATCH 24/34] fichier inutile --- public/hydra.nix | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 public/hydra.nix diff --git a/public/hydra.nix b/public/hydra.nix deleted file mode 100644 index 253902a..0000000 --- a/public/hydra.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ config, pkgs, ... }: - -{ - ####################################### HYDRA - - virtualisation.virtualbox.host.enable = true; - - # une fois installé : - # 1. créer chef SSH : ssh-keygen -C "hydra@pedro.dubronetwork.fr" -N "" -f /etc/nixos/id_buildfarm - # 2. récupérer la clef publique du serveur ssh : ssh-keyscan localhost + l'ajouter dans les knownHosts - # 2. créer un utilisateur - # su - hydra - # hydra-create-user jpierre03 --password toto --role 'admin' - # accessible à hydra.pedro.dubnronetwork.fr - services.hydra = { - enable = true; - hydraURL = "http://hydra.pedro.dubronetwork.fr"; - notificationSender = "hydra@${config.networking.hostName}"; - listenHost = "localhost"; - minimumDiskFree = 50; # Go - }; - - programs.ssh.knownHosts."pedro.dubronetwork.fr".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7fjo2ysLqlfSo6BKnc6I6m1ayoPrbwEEyTKZmUzsOD"; - nix = { - distributedBuilds = true; - buildMachines = [ - { hostName = "pedro.dubronetwork.fr"; maxJobs = 2; speedFactor = 10; sshKey = "/etc/nixos/id_buildfarm"; sshUser = "root"; system = "x86_64-linux"; } - ]; - extraOptions = "auto-optimise-store = true"; - }; - # nix.gc = { - # automatic = true; - #}; -} From 9e8d3b24b386688ec6867de7d9667be9ef8ca68f Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Sat, 22 Oct 2016 15:37:50 +0200 Subject: [PATCH 25/34] correction du nom d'utilisateur pour le build --- public/service-hydra-build.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/service-hydra-build.nix b/public/service-hydra-build.nix index c5b681a..e997a30 100644 --- a/public/service-hydra-build.nix +++ b/public/service-hydra-build.nix @@ -19,7 +19,7 @@ mkIf cfg.hydra-builder { virtualisation.virtualbox.host.enable = true; nix.gc.automatic = true; - users.users."hydrabuild" = { + users.users."hydrabld" = { description = "Execution des job hydra"; group = "nixbld"; isNormalUser = false; From 2982725e0b8d12f00497f6f8abb88e1fe11cdb25 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Tue, 25 Oct 2016 19:52:10 +0200 Subject: [PATCH 26/34] fix: variables d'environnement pour gpg (et donc pass) --- public/bash-interactive-init.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/bash-interactive-init.sh b/public/bash-interactive-init.sh index 3b9f2e6..aad7d75 100644 --- a/public/bash-interactive-init.sh +++ b/public/bash-interactive-init.sh @@ -16,3 +16,8 @@ case "$TERM" in xterm) TERM=xterm-256color;; screen) TERM=screen-256color;; esac + +# info gnupg, invocate gpg agent +GPG_TTY=$(tty) +export GPG_TTY + From 3b04c2edb0b7e418bc36309f153ba63ab83cf097 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Tue, 25 Oct 2016 19:52:45 +0200 Subject: [PATCH 27/34] alias gpg -> gpg2 --- public/environment.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/public/environment.nix b/public/environment.nix index 558f019..15fd39b 100644 --- a/public/environment.nix +++ b/public/environment.nix @@ -57,6 +57,7 @@ in ]; shellAliases = { byobu = "byobu-tmux"; + gpg = "gpg2"; jacques-a-dit = "sudo"; tree = "tree -C"; tree1 = "tree -d -L 1"; From 9201266575f818cfe627d0b3468ee8be06cbff46 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Tue, 25 Oct 2016 20:08:12 +0200 Subject: [PATCH 28/34] Revert "fix: variables d'environnement pour gpg (et donc pass)" This reverts commit 2982725e0b8d12f00497f6f8abb88e1fe11cdb25. --- public/bash-interactive-init.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/public/bash-interactive-init.sh b/public/bash-interactive-init.sh index aad7d75..3b9f2e6 100644 --- a/public/bash-interactive-init.sh +++ b/public/bash-interactive-init.sh @@ -16,8 +16,3 @@ case "$TERM" in xterm) TERM=xterm-256color;; screen) TERM=screen-256color;; esac - -# info gnupg, invocate gpg agent -GPG_TTY=$(tty) -export GPG_TTY - From fa32aed569a545ac490addf65cea4acf5a8285b5 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Wed, 26 Oct 2016 08:32:16 +0200 Subject: [PATCH 29/34] hydra build: correction du type d'user --- public/environment.nix | 3 +++ public/service-hydra-build.nix | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/public/environment.nix b/public/environment.nix index 15fd39b..38746bc 100644 --- a/public/environment.nix +++ b/public/environment.nix @@ -23,6 +23,9 @@ in # Lancement de dbus pour les utilisateurs services.dbus.socketActivated = true; + # NixOS Hardening + security.grsecurity.enable = true; + # Paquets environment = { systemPackages = with pkgs; [ diff --git a/public/service-hydra-build.nix b/public/service-hydra-build.nix index e997a30..98a6453 100644 --- a/public/service-hydra-build.nix +++ b/public/service-hydra-build.nix @@ -20,9 +20,10 @@ mkIf cfg.hydra-builder { nix.gc.automatic = true; users.users."hydrabld" = { - description = "Execution des job hydra"; + description = "Execution des jobs hydra"; group = "nixbld"; - isNormalUser = false; + extraGroups = [ "nixbld" ]; + isNormalUser = true; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGYpjcWJCf8dXpv2LmoIaNVbwZXEC50QUU6Az+lqeD89 hydra radx" From 1916d6eb90cd637a22600185dfbc79516a60a10f Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Fri, 28 Oct 2016 21:27:00 +0200 Subject: [PATCH 30/34] =?UTF-8?q?d=C3=A9sactivation=20grsecurity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/environment.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/environment.nix b/public/environment.nix index 38746bc..b7a7782 100644 --- a/public/environment.nix +++ b/public/environment.nix @@ -24,7 +24,7 @@ in services.dbus.socketActivated = true; # NixOS Hardening - security.grsecurity.enable = true; + #security.grsecurity.enable = true; # Paquets environment = { From f0f266cb55223b60862e1875259876a6be4c9e0c Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Sun, 30 Oct 2016 01:19:25 +0200 Subject: [PATCH 31/34] adresse IP du noeud tinc local --- config-generator.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/config-generator.nix b/config-generator.nix index 2ea0fa1..0d55c10 100644 --- a/config-generator.nix +++ b/config-generator.nix @@ -60,6 +60,13 @@ in virtualbox = mkEnableOption "Profil pour l'utilisation de VirtualBox."; xmonad = mkEnableOption "Profil pour activer le gestionnaire de fenêtres xmonad."; znc = mkEnableOption "Profil pour activer le relais IRC ZNC."; + + tincAddress = mkOption { + default = ""; + example = "192.168.1.1"; + description = "Adresse du noeud tinc local"; + type = lib.types.string; + }; }; #* Utilisé pour avoir des raccourcis de machine r6d.computers = { @@ -207,6 +214,7 @@ in r6d.config-generator = { laptop = true; + tincAddress = "192.168.12.2/24"; }; }) (mkIf comp.isMonstre { @@ -260,6 +268,7 @@ in nix-serve-server = true; laptop = true; edition-photo = true; + tincAddress = "192.168.12.1/24"; }; }) (mkIf comp.isRollo { From 0a3d820dd62bf8771aadfd3bd49c55de004db8bd Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Sun, 30 Oct 2016 01:24:27 +0200 Subject: [PATCH 32/34] variable pour les noeuds auquels tinc doit se connecter --- config-generator.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/config-generator.nix b/config-generator.nix index 0d55c10..eaf1da1 100644 --- a/config-generator.nix +++ b/config-generator.nix @@ -67,6 +67,16 @@ in description = "Adresse du noeud tinc local"; type = lib.types.string; }; + tincPeers = mkOption { + default = ""; + example = '' + toto + foo + bar + ''; + description = "Noeuds tinc auquels se connecter (ConnectTo)"; + type = lib.types.string; + }; }; #* Utilisé pour avoir des raccourcis de machine r6d.computers = { @@ -215,6 +225,7 @@ in r6d.config-generator = { laptop = true; tincAddress = "192.168.12.2/24"; + tincPeers = "phenom_dubronetwork_fr"; }; }) (mkIf comp.isMonstre { From 31f57965f9af5f76bece69922a253c75f0a912dd Mon Sep 17 00:00:00 2001 From: Yves Dubromelle Date: Sun, 30 Oct 2016 01:31:40 +0200 Subject: [PATCH 33/34] =?UTF-8?q?peers=20->=20extraconfig=20de=20tinc,=20p?= =?UTF-8?q?our=20=C3=AAtre=20plus=20souple?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config-generator.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/config-generator.nix b/config-generator.nix index eaf1da1..4eab55f 100644 --- a/config-generator.nix +++ b/config-generator.nix @@ -67,14 +67,13 @@ in description = "Adresse du noeud tinc local"; type = lib.types.string; }; - tincPeers = mkOption { + tincExtraConfig = mkOption { default = ""; example = '' - toto - foo - bar + Mode = router + ConnecTo = bar ''; - description = "Noeuds tinc auquels se connecter (ConnectTo)"; + description = "Configuration supplémentaire pour tinc"; type = lib.types.string; }; }; @@ -225,7 +224,7 @@ in r6d.config-generator = { laptop = true; tincAddress = "192.168.12.2/24"; - tincPeers = "phenom_dubronetwork_fr"; + tincExtraConfig = "ConnectTo = phenom_dubronetwork_fr"; }; }) (mkIf comp.isMonstre { From 021b1d5c26fbf7280c0c31e60751bf138fd91b93 Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Mon, 31 Oct 2016 14:17:03 +0100 Subject: [PATCH 34/34] =?UTF-8?q?Revert=20"lors=20d'une=20full-auto,=20on?= =?UTF-8?q?=20ne=20force=20pas=20=C3=A0=20=C3=AAtre=20sur=20la=20branche?= =?UTF-8?q?=20master"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3a8a728268b7f9f91eb045978c0ef529604f30a5. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8aec7b1..bb2333f 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ push: submodules-push submodules-update: #git submodule update --remote - #git submodule foreach git co master + git submodule foreach git co master git submodule foreach git ff submodules-push: