marcoduif/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests 1 Projects Releases Wiki Activity

Fix removing ssh key that is last one in the file.

Browse source
This commit is contained in:
Darko Poljak 2017-08-30 09:27:06 +02:00
commit eae399b025
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cdist/conf/type/__ssh_authorized_key/explorer/entry
View file

@ -23,4 +23,4 @@ type_and_key="$(cat "$__object/parameter/key" | tr ' ' '\n' | awk '/^(ssh|ecdsa)
file="$(cat $__object/parameter/file)" file="$(cat $__object/parameter/file)"
# get any entries that match the type and key # get any entries that match the type and key
grep ".*$type_and_key[ \n]" "$file" || true grep ".*$type_and_key\([ \n]\|$\)" "$file" || true

1
docs/changelog
View file

@ -10,6 +10,7 @@ next:
* Type __user_groups: Support OpenBSD (Philippe Gregoire) * Type __user_groups: Support OpenBSD (Philippe Gregoire)
* Type __hostname: Allow hostnamectl to fail silently (Steven Armstrong) * Type __hostname: Allow hostnamectl to fail silently (Steven Armstrong)
* Type __install_config: Use default default __remote_{copy,exec} in custom __remote_{copy,exec} scripts (Steven Armstrong) * Type __install_config: Use default default __remote_{copy,exec} in custom __remote_{copy,exec} scripts (Steven Armstrong)
* Type __ssh_authorized_key: Fix removing ssh key that is last one in the file (Darko Poljak)
4.6.0: 2017-08-25 4.6.0: 2017-08-25
* Core: Add inventory functionality (Darko Poljak) * Core: Add inventory functionality (Darko Poljak)