From baf430cd2378500253e175372e1f079d8235c04a Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Fri, 24 Dec 2004 14:10:19 +0000 Subject: [PATCH] don't let openssh generate a new hostkey when installing, let this be done afterwards by the sysadmin svn path=/nixpkgs/branches/nixos-pkgs/; revision=1947 --- pkgs/tools/networking/openssh/builder.sh | 12 ++++++++---- pkgs/tools/networking/openssh/default.nix | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/openssh/builder.sh b/pkgs/tools/networking/openssh/builder.sh index f9fc634dce9..0573f1c6d67 100644 --- a/pkgs/tools/networking/openssh/builder.sh +++ b/pkgs/tools/networking/openssh/builder.sh @@ -1,9 +1,13 @@ . $stdenv/setup + configureFlags="--with-privsep-path=$out/empty" +postInstall() { + rm $out/etc/ssh_host_dsa_key $out/etc/ssh_host_dsa_key.pub $out/etc/ssh_host_key $out/etc/ssh_host_key.pub $out/etc/ssh_host_rsa_key $out/etc/ssh_host_rsa_key.pub + + chmod +r $out/libexec/ssh-keysign +} +#postInstall=postInstall + genericBuild - -rm $out/etc/ssh_host_dsa_key $out/etc/ssh_host_dsa_key.pub $out/etc/ssh_host_key $out/etc/ssh_host_key.pub $out/etc/ssh_host_rsa_key $out/etc/ssh_host_rsa_key.pub - -chmod +r $out/libexec/ssh-keysign diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index f5ca543f70b..d8194ccb63b 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -10,4 +10,5 @@ stdenv.mkDerivation { }; buildInputs = [zlib openssl]; + patches = [./openssh-no-host-key.patch]; }