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

Handle stdin to __systemd_unit correctly

Browse source 
When directly piping in the source of a systemd unit file, cdist
errored out. This is due to not propagating the stdin file to the
underlying __config_file type (which already contains code for this
case, but this has to be duplicated in __systemd_unit).

The following example thus works:

    __systemd_unit test.service --source - <<EOF
    [Service]
    ExecStart=/bin/sleep 3600
    EOF
This commit is contained in:
Jonas Weber 2018-01-19 22:06:37 +01:00
commit dd188ca588
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cdist/conf/type/__systemd_unit/manifest
View file

@ -34,6 +34,11 @@ if [ -z "${source}" ] && [ "${state}" != "absent" ]; then
exit 0 exit 0
fi fi
# stdin is not propagated automatically to sub-objects
if [ "${source}" = "-" ]; then
source="${__object}/stdin"
fi
__config_file "/etc/systemd/system/${name}" \ __config_file "/etc/systemd/system/${name}" \
--mode 644 \ --mode 644 \
--onchange "systemctl daemon-reload" \ --onchange "systemctl daemon-reload" \