Merge branch 'master' of https://github.com/telmich/cdist into bugfix_type__key_value
This commit is contained in:
commit
d1c55a9acb
2 changed files with 13 additions and 10 deletions
|
@ -1,6 +1,7 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# 2012-2014 Steven Armstrong (steven-cdist at armstrong.cc)
|
||||
# 2014 Nico Schottelius (nico-cdist at schottelius.org)
|
||||
#
|
||||
# This file is part of cdist.
|
||||
#
|
||||
|
@ -70,17 +71,17 @@ _cksum() {
|
|||
echo "$1" | cksum | cut -d' ' -f 1
|
||||
}
|
||||
|
||||
# Add each key
|
||||
IFS=$'\n'
|
||||
for key in $(cat "$__object/parameter/key"); do
|
||||
unset IFS
|
||||
raw_key="$(echo "$key" | tr ' ' '\n' | awk '/^ssh-(rsa|dsa)/ {printf $1" ";getline;printf $1}')"
|
||||
set -- "$(_cksum "$raw_key")"
|
||||
while read key; do
|
||||
cksum_key="$(_cksum "$key")"
|
||||
line_id="${owner}-${cksum_key}"
|
||||
|
||||
set -- "$line_id"
|
||||
set -- "$@" --file "$file"
|
||||
set -- "$@" --regex ".*$raw_key.*"
|
||||
set -- "$@" --regex ".*$key.*"
|
||||
if [ "$state" = 'present' ]; then
|
||||
set -- "$@" --line "$key"
|
||||
fi
|
||||
set -- "$@" --state "$state"
|
||||
require="__block/$__object_name" __line "$@"
|
||||
done
|
||||
# Ensure __line does not read stdin
|
||||
require="__block/$__object_name" __line "$@" < /dev/null
|
||||
done < "$__object/parameter/key"
|
||||
|
|
|
@ -5,8 +5,10 @@ Changelog
|
|||
* Exception: No braces means author == Nico Schottelius
|
||||
|
||||
|
||||
3.0.10:
|
||||
next:
|
||||
* Type __git: Pass onwer/group/mode values to __directory
|
||||
* Type __ssh_authorized_keys: Allow managing existing keys (Steven Armstrong)
|
||||
|
||||
|
||||
3.0.9: 2014-02-14
|
||||
* Core: Ignore order dependencies if override is set (Daniel Heule)
|
||||
|
|
Loading…
Reference in a new issue