Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ssh: add addKeysToAgent option #3499

Merged
merged 1 commit into from
Dec 13, 2023

Conversation

lockejan
Copy link
Contributor

@lockejan lockejan commented Dec 15, 2022

Description

add addKeysToAgent option to ssh module

Checklist

  • Change is backwards compatible.

  • Code formatted with ./format.

  • Code tested through nix-shell --pure tests -A run.all.

  • Test cases updated/added. See example.

  • Commit messages are formatted like

    {component}: {description}
    
    {long description}
    

    See CONTRIBUTING for more information and recent commit messages for examples.

  • If this PR adds a new module

    • Added myself as module maintainer. See example.

    • Added myself and the module files to .github/CODEOWNERS.

modules/programs/ssh.nix Outdated Show resolved Hide resolved
@stale
Copy link

stale bot commented Mar 21, 2023

Thank you for your contribution! I marked this pull request as stale due to inactivity. Please read the relevant sections below before commenting.

If you are the original author of the PR

  • GitHub sometimes doesn't notify people who commented / reviewed a PR previously when you (force) push commits. If you have addressed the reviews you can officially ask for a review from those who commented to you or anyone else.
  • If it is unfinished but you plan to finish it, please mark it as a draft.
  • If you don't expect to work on it any time soon, please consider closing it with a short comment encouraging someone else to pick up your work.
  • To get things rolling again, rebase the PR against the target branch and address valid comments.

If you are not the original author of the PR

  • If you want to pick up the work on this PR, please create a new PR and indicate that it supercedes and closes this PR.

@lockejan
Copy link
Contributor Author

My concerns persist, but I've changed the PR as suggested. I've rebased and ran all tests again. I leave the final decision to @rycee . Feel free to close or merge.

@sumnerevans
Copy link
Member

Probably needs a rebase to get the tests passing.

@lockejan
Copy link
Contributor Author

lockejan commented Jun 7, 2023

Probably needs a rebase to get the tests passing.

Maybe you are right. I rebased and ran the tests again locally, this time against the flake inputs nix develop --ignore-environment .#all.
No errors whatsoever.
Should be fine now.

@stale
Copy link

stale bot commented Sep 7, 2023

Thank you for your contribution! I marked this pull request as stale due to inactivity. Please read the relevant sections below before commenting.

If you are the original author of the PR

  • GitHub sometimes doesn't notify people who commented / reviewed a PR previously when you (force) push commits. If you have addressed the reviews you can officially ask for a review from those who commented to you or anyone else.
  • If it is unfinished but you plan to finish it, please mark it as a draft.
  • If you don't expect to work on it any time soon, please consider closing it with a short comment encouraging someone else to pick up your work.
  • To get things rolling again, rebase the PR against the target branch and address valid comments.

If you are not the original author of the PR

  • If you want to pick up the work on this PR, please create a new PR and indicate that it supercedes and closes this PR.

@stale stale bot added the status: stale label Sep 7, 2023
@lockejan
Copy link
Contributor Author

@sumnerevans

@stale stale bot removed the status: stale label Sep 12, 2023
Copy link

stale bot commented Dec 12, 2023

Thank you for your contribution! I marked this pull request as stale due to inactivity. Please read the relevant sections below before commenting.

If you are the original author of the PR

  • GitHub sometimes doesn't notify people who commented / reviewed a PR previously when you (force) push commits. If you have addressed the reviews you can officially ask for a review from those who commented to you or anyone else.
  • If it is unfinished but you plan to finish it, please mark it as a draft.
  • If you don't expect to work on it any time soon, please consider closing it with a short comment encouraging someone else to pick up your work.
  • To get things rolling again, rebase the PR against the target branch and address valid comments.

If you are not the original author of the PR

  • If you want to pick up the work on this PR, please create a new PR and indicate that it supercedes and closes this PR.

@stale stale bot added the status: stale label Dec 12, 2023
@stale stale bot removed the status: stale label Dec 13, 2023
@rycee rycee merged commit 7a69b3e into nix-community:master Dec 13, 2023
3 checks passed
@rycee
Copy link
Member

rycee commented Dec 13, 2023

Sorry about the delay! Finally round to merging this 🙂

@sersorrel
Copy link
Contributor

Change is backwards compatible.

unfortunately this change inscrutably breaks behaviour for anyone who set programs.ssh.extraConfig to "AddKeysToAgent yes" already, since per ssh_config(5) "for each parameter, the first obtained value will be used" and the new programs.ssh.addKeysToAgent inserts its AddKeysToAgent line before extraConfig.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants