Branch: refs/heads/release-17.03
Home: https://github.com/NixOS/nixpkgs
Commit: 1847793b6501fa683b0b654e2570ea289ebfb03c
https://github.com/NixOS/nixpkgs/commit/1847793b6501fa683b0b654e2570ea289ebfb03c
Author: Eelco Dolstra <edols...@gmail.com>
Date: 2017-03-31 (Fri, 31 Mar 2017)
Changed paths:
M nixos/modules/services/networking/ssh/sshd.nix
Log Message:
-----------
Revert "sshd: separate key generation into another service"
This reverts commit 1a74eedd074fac69d12cecb767dc207a4bfea1bb. 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 4e79b0b0751e84c845da8ed4062a501a48335dc1)
Commit: 1484e4026ae2c726079e5e49c4ab74f2c8ecd046
https://github.com/NixOS/nixpkgs/commit/1484e4026ae2c726079e5e49c4ab74f2c8ecd046
Author: Eelco Dolstra <edols...@gmail.com>
Date: 2017-03-31 (Fri, 31 Mar 2017)
Changed paths:
M nixos/modules/services/networking/ssh/sshd.nix
Log Message:
-----------
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 80b40fdf03411a26c0340f28636fe9b5e0afc73b)
Compare: https://github.com/NixOS/nixpkgs/compare/94df4663034b...1484e4026ae2_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
