Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 94df4663034b
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 1484e4026ae2
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Mar 31, 2017

  1. Revert "sshd: separate key generation into another service" 

    This reverts commit 1a74eed. It
breaks NixOps, which expects that

  rm -f /etc/ssh/ssh_host_ed25519_key*
  systemctl restart sshd
  cat /etc/ssh/ssh_host_ed25519_key.pub

works.

(cherry picked from commit 4e79b0b)
    @edolstra
    edolstra committed Mar 31, 2017
    Configuration menu
    Copy the full SHA
    1847793 View commit details
    Browse the repository at this point in the history

  2. sshd.nix: Alternative fix for #19589 

    AFAICT, this issue only occurs when sshd is socket-activated. It turns
out that the preStart script's stdout and stderr are connected to the
socket, not just the main command's. So explicitly connect stderr to
the journal and redirect stdout to stderr.

(cherry picked from commit 80b40fd)
    @edolstra
    edolstra committed Mar 31, 2017
    Configuration menu
    Copy the full SHA
    1484e40 View commit details
    Browse the repository at this point in the history