yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

treewide: don't generate SSH keys with builder hostname

Browse Source
This commit is contained in:
Michael Hoang
2025-07-07 14:07:40 +10:00
parent 89ea01fd04
commit e6785fa1d0
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
clanModules/borgbackup/roles/client.nix
View File

@@ -196,7 +196,7 @@ in
pkgs.xkcdpass pkgs.xkcdpass
]; ];
script = '' script = ''
ssh-keygen -t ed25519 -N "" -f "$out"/borgbackup.ssh ssh-keygen -t ed25519 -N "" -C "" -f "$out"/borgbackup.ssh
xkcdpass -n 4 -d - > "$out"/borgbackup.repokey xkcdpass -n 4 -d - > "$out"/borgbackup.repokey
''; '';
}; };

4
clanModules/sshd/roles/server.nix
View File

@@ -54,7 +54,7 @@ in
pkgs.openssh pkgs.openssh
]; ];
script = '' script = ''
ssh-keygen -t ed25519 -N "" -f "$out"/ssh.id_ed25519 ssh-keygen -t ed25519 -N "" -C "" -f "$out"/ssh.id_ed25519
''; '';
}; };
@@ -74,7 +74,7 @@ in
pkgs.openssh pkgs.openssh
]; ];
script = '' script = ''
ssh-keygen -t rsa -b 4096 -N "" -f "$out"/ssh.id_rsa ssh-keygen -t rsa -b 4096 -N "" -C "" -f "$out"/ssh.id_rsa
''; '';
}; };

2
clanModules/sshd/shared.nix
View File

@@ -36,7 +36,7 @@
pkgs.openssh pkgs.openssh
]; ];
script = '' script = ''
ssh-keygen -t ed25519 -N "" -f "$out"/id_ed25519 ssh-keygen -t ed25519 -N "" -C "" -f "$out"/id_ed25519
''; '';
}; };

2
clanServices/borgbackup/default.nix
View File

@@ -256,7 +256,7 @@
pkgs.xkcdpass pkgs.xkcdpass
]; ];
script = '' script = ''
ssh-keygen -t ed25519 -N "" -f "$out"/borgbackup.ssh ssh-keygen -t ed25519 -N "" -C "" -f "$out"/borgbackup.ssh
xkcdpass -n 4 -d - > "$out"/borgbackup.repokey xkcdpass -n 4 -d - > "$out"/borgbackup.repokey
''; '';
}; };

8
clanServices/sshd/default.nix
View File

@@ -49,7 +49,7 @@
pkgs.openssh pkgs.openssh
]; ];
script = '' script = ''
ssh-keygen -t ed25519 -N "" -f "$out"/id_ed25519 ssh-keygen -t ed25519 -N "" -C "" -f "$out"/id_ed25519
''; '';
}; };
@@ -109,7 +109,7 @@
pkgs.openssh pkgs.openssh
]; ];
script = '' script = ''
ssh-keygen -t ed25519 -N "" -f "$out"/id_ed25519 ssh-keygen -t ed25519 -N "" -C "" -f "$out"/id_ed25519
''; '';
}; };
@@ -151,7 +151,7 @@
pkgs.openssh pkgs.openssh
]; ];
script = '' script = ''
ssh-keygen -t rsa -b 4096 -N "" -f "$out"/ssh.id_rsa ssh-keygen -t rsa -b 4096 -N "" -C "" -f "$out"/ssh.id_rsa
''; '';
}; };
@@ -164,7 +164,7 @@
pkgs.openssh pkgs.openssh
]; ];
script = '' script = ''
ssh-keygen -t ed25519 -N "" -f "$out"/ssh.id_ed25519 ssh-keygen -t ed25519 -N "" -C "" -f "$out"/ssh.id_ed25519
''; '';
}; };
}; };

4
docs/site/guides/disk-encryption.md
View File

@@ -122,8 +122,8 @@ CTRL+D
4. Locally generate ssh host keys. You only need to generate ones for the algorithms you're using in `authorizedKeys`. 4. Locally generate ssh host keys. You only need to generate ones for the algorithms you're using in `authorizedKeys`.
```bash ```bash
ssh-keygen -q -N "" -t ed25519 -f ./initrd_host_ed25519_key ssh-keygen -q -N "" -C "" -t ed25519 -f ./initrd_host_ed25519_key
ssh-keygen -q -N "" -t rsa -b 4096 -f ./initrd_host_rsa_key ssh-keygen -q -N "" -C "" -t rsa -b 4096 -f ./initrd_host_rsa_key
``` ```
5. Securely copy your local initrd ssh host keys to the installer's `/mnt` directory: 5. Securely copy your local initrd ssh host keys to the installer's `/mnt` directory: