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

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
2020-07-13 05:44:26 +00:00 · 2020-07-13 05:44:26 +00:00 · bc97073131
parent 652ffea4a8
commit bc97073131
3 changed files with 2 additions and 2 deletions
--- a/cdist/conf/type/__postfix_master/gencode-remote
+++ b/cdist/conf/type/__postfix_master/gencode-remote
@ -67,7 +67,7 @@ case "$state_should" in
         remove_entry
      fi
      cat << DONE
-cat >> "$config" << ${__type##*/}_DONE
+cat >> "$config" << "${__type##*/}_DONE"
 $(cat "$entry")
 ${__type##*/}_DONE
 DONE
--- a/cdist/conf/type/__postfix_master/parameter/optional
+++ b/cdist/conf/type/__postfix_master/parameter/optional
@ -4,6 +4,5 @@ unpriv
 chroot
 wakeup
 maxproc
-option
 comment
 state
--- a/cdist/conf/type/__postfix_master/parameter/optional_multiple
+++ b/cdist/conf/type/__postfix_master/parameter/optional_multiple
@ -0,0 +1 @@
+option