Merge branch 'cherry-pick-2f433a14' into 'master'

Merge branch 'bugfix/postfix-master-option' into master See merge request ungleich-public/cdist!907
2020-07-13 07:51:25 +02:00 · 2020-07-13 07:51:25 +02:00 · cc089789de
commit cc089789de
parent 652ffea4a8 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