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

include the owner into the object_id for line

Browse source 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
This commit is contained in:
Nico Schottelius 2014-02-24 16:00:12 +01:00
parent d6b7033f2b
commit ce0f779664
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cdist/conf/type/__ssh_authorized_keys/manifest
View file

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# 2012-2014 Steven Armstrong (steven-cdist at armstrong.cc) # 2012-2014 Steven Armstrong (steven-cdist at armstrong.cc)
# 2014 Nico Schottelius (nico-cdist at schottelius.org)
# #
# This file is part of cdist. # This file is part of cdist.
# #
@ -75,7 +76,11 @@ IFS=$'\n'
for key in $(cat "$__object/parameter/key"); do for key in $(cat "$__object/parameter/key"); do
unset IFS unset IFS
raw_key="$(echo "$key" | tr ' ' '\n' | awk '/^ssh-(rsa|dsa)/ {printf $1" ";getline;printf $1}')" raw_key="$(echo "$key" | tr ' ' '\n' | awk '/^ssh-(rsa|dsa)/ {printf $1" ";getline;printf $1}')"
set -- "$(_cksum "$raw_key")"
cksum_key="$(_cksum "$raw_key")"
line_id="${owner}-${cksum_key}"
set -- "$line_id"
set -- "$@" --file "$file" set -- "$@" --file "$file"
set -- "$@" --regex ".*$raw_key.*" set -- "$@" --regex ".*$raw_key.*"
if [ "$state" = 'present' ]; then if [ "$state" = 'present' ]; then