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

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

Browse source 
Allow reading contents of __motd and __issue from stdin
This commit is contained in:
Darko Poljak 2018-01-31 20:12:10 +01:00 committed by GitHub
commit 87558adbda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cdist/conf/type/__issue/manifest
View file

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

3
cdist/conf/type/__motd/manifest
View file

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