Define infra-core list
Eelco Dolstra committed
Aug 23, 2023 at 16:34 UTC
14f20faeca0ae439502bbb13191eae0b0602f633
5 files changed
+9
-10
bastion/configuration.nix
+1
-2
@@ -42,8 +42,7 @@ in
42
users.extraUsers.deploy = {
43
description = "NixOps deployments";
44
isNormalUser = true;
45
- openssh.authorizedKeys.keys =
46
- [ sshKeys.eelco sshKeys.rob sshKeys.graham sshKeys.graham-hermes-conrad sshKeys.zimbatm sshKeys.amine sshKeys.vcunat ];
45
+ openssh.authorizedKeys.keys = sshKeys.infra-core;
46
extraGroups = [ "wheel" ];
47
};
48
delft/hydra.nix
+3
-3
@@ -8,11 +8,11 @@ in
8
9
{
10
users.extraUsers.hydra.openssh.authorizedKeys.keys =
11
- with import ../ssh-keys.nix; [ eelco rob ];
11
+ (import ../ssh-keys.nix).infra-core;
12
users.extraUsers.hydra-www.openssh.authorizedKeys.keys =
13
- with import ../ssh-keys.nix; [ eelco rob ];
13
+ (import ../ssh-keys.nix).infra-core;
14
users.extraUsers.hydra-queue-runner.openssh.authorizedKeys.keys =
15
- with import ../ssh-keys.nix; [ eelco rob ];
15
+ (import ../ssh-keys.nix).infra-core;
16
17
services.hydra-dev.enable = true;
18
services.hydra-dev.logo = ./hydra-logo.png;
modules/common.nix
+1
-1
@@ -8,7 +8,7 @@ with lib;
8
users.mutableUsers = false;
9
10
users.extraUsers.root.openssh.authorizedKeys.keys =
11
- with import ../ssh-keys.nix; [ eelco rob ];
11
+ (import ../ssh-keys.nix).infra-core;
12
13
nix.useSandbox = true;
14
nix.buildCores = 0;
modules/hydra-mirror-user.nix
+1
-1
@@ -2,7 +2,7 @@
2
users.users.hydra-mirror =
3
{ description = "Channel mirroring user";
4
home = "/home/hydra-mirror";
5
- openssh.authorizedKeys.keys = with import ../ssh-keys.nix; [ eelco rob ];
5
+ openssh.authorizedKeys.keys = (import ../ssh-keys.nix).infra-core;
6
uid = 497;
7
group = "hydra-mirror";
8
};
ssh-keys.nix
+3
-3
@@ -1,9 +1,7 @@
1
-{
1
+rec {
2
3
eelco = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAnI5L6oCgFyvEesL04LnbnH1TBhegq1Yery6TNlIRAA edolstra@gmail.com";
4
5
- rob = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDHp3/OZP2nRS5bM9E1xN8Q2L398kC+m4guORjKsmGjwnnHvYnTml5puE2ogl8Wdenbk7hf82+vKyB+Tktrhx+IBSym4lY+czR6W+39hlPYdLbi980yxYT9KEMSyMWJEgPVJ1BZvHqsHQiad/L3eoPmAIMDmcn4mLh9rya5/oMW/ZgsA6j28ClvWkDRyaTmTLOa0Im4nLoSbdo8kJqU+JX/YcXlMKUvFfdMcj4T9YYwV98LPWHnEHFmjtBBUXRUAIESMXS6pm3Pep3czkKUL4UF0u9f17b40OWlLOF4IQWE2jM9yK09DiIQUzeU2XKRNW116DnmDL5QIRNrYnhkYeeQI3U6WnVTPdTU9kBVTDjhM+6U6/LClGJaWiglwwrzHtVELHgMi280qRefQEftb4CI/IbcPNAxetJevV68I5NAjfdnmMx8YbhfIiEqAJtBi4TvoH7HjDH+72+ZFjQ10fpz/p+DgUtiNlRKz8tXSZ+mbLuhmOJOxtGQTH3viYbSpG/4F9uKW1ekX0RMyRxVvpjMxHtCL4daJI4RTHFXy4R16OKAlYe7gs9sqv7O0IujLJPex/rnN2U4syGaSH5q3UnGxci6qgn8yLEhSP+Gj0xdv5H3fVjr/kNNZGWDOz6nDUaJT+eWlmWU7hOvm0ricrz9GEPUTQ0Rh70sWTQFq3poWQ== cardno:000606167509";
6
-
5
provisioner = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKDSfHu0xHu2qtWjmCC92rTMZfwZNKXrsJvPCLSoWtzR eelco.dolstra@deploy";
6
7
hydra-queue-runner = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCyM48VC5fpjJssLI8uolFscP4/iEoMHfkPoT9R3iE3OEjadmwa1XCAiXUoa7HSshw79SgPKF2KbGBPEVCascdAcErZKGHeHUzxj7v3IsNjObouUOBbJfpN4DR7RQT28PZRsh3TvTWjWnA9vIrSY/BvAK1uezFRuObvatqAPMrw4c0DK+JuGuCNkKDGHLXNSxYBc5Pmr1oSU7/BDiHVjjyLIsAMIc20+q8SjWswKqL1mY193mN7FpUMBtZrd0Za9fMFRII9AofEIDTOayvOZM6+/1dwRWZXM6jhE6kaPPF++yromHvDPBnd6FfwODKLvSF9BkA3pO5CqrD8zs7ETmrV hydra-queue-runner@chef";
@@ -26,4 +24,6 @@
24
25
hexa-gaia = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAWQRR7dspgQ6kCwyFnoVlgmmPR4iWL1+nvq6a5ad2Ug hexa@gaia";
26
hexa-helix = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFSpdtIxIBFtd7TLrmIPmIu5uemAFJx4sNslRsJXfFxr hexa@helix";
27
+
28
+ infra-core = [ eelco graham graham-hermes-conrad zimbatm amine vcunat ];
29
}