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 + 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"; 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; - #}; -} 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;