Allow makemake to be used for remote builds #307
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Following 5f64f82 and assuming we want to be aligned with NixOS/infra #427 remove delroth's key
Also convert ssh-keys to a rec so we can more easily add people only to the remotebuild user and not root
Erethon
force-pushed
the
makemake-remote-build
branch
from
3a4ae03
to
adc4e0b
Compare
| users.root.openssh.authorizedKeys.keys = (import ../ssh-keys.nix).root; | ||
| users.remotebuild = { | ||
| isNormalUser = true; | ||
| openssh.authorizedKeys.keys = (import ../ssh-keys.nix).remotebuild; |
There was a problem hiding this comment.
A pattern that is very likely much easier to work with is having the keys in a directory, where each filename is the username. This is just a sketch:
Suggested change
| openssh.authorizedKeys.keys = (import ../ssh-keys.nix).remotebuild; | |
| openssh.authorizedKeys.keyFiles = with lib; | |
| map (n: ./keys/${n}) (attrNames (builtins.readDir ./remotebuild)); |
You probably want to store those key groups in a let binding right here in this file, and combine them as needed for each user on the machine, so whatever logic there is visible at first glance.
Then the instructions to add a key can reduce to
cp ~/.ssh/<key>.pub <path>/ngipkgs/infra/makemake/remotebuild/<name>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patchset changes the ssh-keys.nix structure a bit, adds a new user to
makemakeand adds some documentation. In particular:ssh-keys.nixto match ssh-keys: cleanup NixOS/infra#427.remotebuildtomakemake.ssh-keys.nixto arecand create two new lists, one for people that should haverootaccess and one for people that should only have access to the newly createdremotebuilduser.makemakein order to use it as a remote build host.