rouxdo/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'github/master'

Browse source
This commit is contained in:
Nico Schottelius 2013-09-27 23:25:51 +02:00
commit ba3819a83e
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cdist/conf/type/__ssh_authorized_keys/gencode-remote
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# 2012 Steven Armstrong (steven-cdist at armstrong.cc) # 2012-2013 Steven Armstrong (steven-cdist at armstrong.cc)
# #
# This file is part of cdist. # This file is part of cdist.
# #
@ -24,7 +24,7 @@ if [ -f "$__object/parameter/file" ]; then
else else
home="$(cut -d':' -f 6 "$__object/explorer/passwd")" home="$(cut -d':' -f 6 "$__object/explorer/passwd")"
file="$home/.ssh/authorized_keys" file="$home/.ssh/authorized_keys"
fi fi
entry="$__object/files/entry" entry="$__object/files/entry"
if [ ! -s "$__object/explorer/entry" ]; then if [ ! -s "$__object/explorer/entry" ]; then
@ -47,7 +47,9 @@ remove_entry() {
prefix="#cdist:$__object_name" prefix="#cdist:$__object_name"
suffix="#/cdist:$__object_name" suffix="#/cdist:$__object_name"
cat << DONE cat << DONE
tmpfile=\$(mktemp) tmpfile=\$(mktemp ${file}.cdist.XXXXXXXXXX)
# preserve ownership and permissions by copying existing file over tmpfile
cp -p "$file" "\$tmpfile"
awk -v prefix="$prefix" -v suffix="$suffix" ' awk -v prefix="$prefix" -v suffix="$suffix" '
{ {
if (index(\$0,prefix)) { if (index(\$0,prefix)) {