Merge pull request #620 from thriqon/130-issue-stdin

Allow reading contents of __motd and __issue from stdin
remotes/origin/key_value-onchange
Darko Poljak 7 years ago committed by GitHub
commit 87558adbda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      cdist/conf/type/__issue/manifest
  2. 3
      cdist/conf/type/__motd/manifest

@ -25,6 +25,9 @@ os="$(cat "$__global/explorer/os")"
if [ -f "$__object/parameter/source" ]; then
source="$(cat "$__object/parameter/source")"
if [ "$source" = "-" ]; then
source="${__object}/stdin"
fi
else
case "$os" in
archlinux|redhat)

@ -22,6 +22,9 @@
# Select motd source
if [ -f "$__object/parameter/source" ]; then
source="$(cat "$__object/parameter/source")"
if [ "$source" = "-" ]; then
source="${__object}/stdin"
fi
else
source="$__type/files/motd"
fi

Loading…
Cancel
Save