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

correctly merge and reformat custom json into generated config

Browse source 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2015-08-13 20:45:31 +02:00
commit c3bf4c7b61
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cdist/conf/type/__consul_agent/manifest
View file

@ -126,10 +126,10 @@ if [ -f "$__object/parameter/json-config" ]; then
if [ "$json_config" = "-" ]; then if [ "$json_config" = "-" ]; then
json_config="$__object/stdin" json_config="$__object/stdin"
fi fi
printf ',' # remove leading and trailing whitespace and commas from first and last line
# remove trailing , # indent each line with 3 spaces for consistency
json=$(cat "$json_config") json=$(sed -e 's/^[ \t]*/ /' -e '1s/^[ \t,]*//' -e '$s/[ \t,]*$//' "$json_config")
echo "${json%*,}" printf ' ,%s\n' "$json"
fi fi
echo "}" echo "}"
) | \ ) | \