sparrowhawk/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/postfix-master-option' into '6.6'

Browse source 
Fix broken --option parameter in __postfix_master type

See merge request ungleich-public/cdist!905

(cherry picked from commit 2f433a1458f3a1f7f8859e9ae165178a0ec5b7a0)

9496b234 The option parameter is actually multi-valued
4009bbd7 Protect postfix variables in options
This commit is contained in:
poljakowski 2020-07-13 05:44:26 +00:00
parent 652ffea4a8
commit bc97073131
3 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cdist/conf/type/__postfix_master/gencode-remote
View file

@ -67,7 +67,7 @@ case "$state_should" in
remove_entry remove_entry
fi fi
cat << DONE cat << DONE
cat >> "$config" << ${__type##*/}_DONE cat >> "$config" << "${__type##*/}_DONE"
$(cat "$entry") $(cat "$entry")
${__type##*/}_DONE ${__type##*/}_DONE
DONE DONE

1
cdist/conf/type/__postfix_master/parameter/optional
View file

@ -4,6 +4,5 @@ unpriv
chroot chroot
wakeup wakeup
maxproc maxproc
option
comment comment
state state

1
cdist/conf/type/__postfix_master/parameter/optional_multiple Normal file
View file

@ -0,0 +1 @@
option