public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* In the implementation of the ‘authorizedKeys’, don't delete all

Browse Source 
lines below a certain marker.  This is undesirable because commands
  like "ssh-copy-id" add keys to the end of the file.  Instead mark
  all automatically added lines individually.

svn path=/nixos/trunk/; revision=33918
This commit is contained in:
Eelco Dolstra 2012-04-25 14:14:20 +00:00
parent e3470145e0
commit 43215ff80f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/services/networking/ssh/sshd.nix
View File

@ -73,7 +73,7 @@ let
mkAuthkeyScript = mkAuthkeyScript =
let let
marker1 = "### NixOS will regenerate this line and every line below it."; marker1 = "### NixOS auto-added key. Do not edit!";
marker2 = "### NixOS will regenerate this file. Do not edit!"; marker2 = "### NixOS will regenerate this file. Do not edit!";
users = map (userName: getAttr userName config.users.extraUsers) (attrNames config.users.extraUsers); users = map (userName: getAttr userName config.users.extraUsers) (attrNames config.users.extraUsers);
usersWithKeys = flip filter users (u: usersWithKeys = flip filter users (u:
@ -98,7 +98,7 @@ let
for f in $authKeyFiles; do for f in $authKeyFiles; do
if [ -f "$f" ]; then if [ -f "$f" ]; then
authKeys="$(${pkgs.coreutils}/bin/cat "$f"),$authKeys" authKeys="$(${pkgs.coreutils}/bin/cat "$f") ${marker1},$authKeys"
fi fi
done done
@ -110,8 +110,7 @@ let
rm -f "$authfile" rm -f "$authfile"
authKeys="${marker2},$authKeys" authKeys="${marker2},$authKeys"
else else
${pkgs.gnused}/bin/sed -i '/^### NixOS.*$/,$d' "$authfile" ${pkgs.gnused}/bin/sed -i '/${marker1}/ d' "$authfile"
authKeys="${marker1},$authKeys"
fi fi
for key in $authKeys; do ${pkgs.coreutils}/bin/echo "$key" >> "$authfile"; done for key in $authKeys; do ${pkgs.coreutils}/bin/echo "$key" >> "$authfile"; done
fi fi