diff --git a/seqs/mailserver.sh b/seqs/mailserver.sh index 343bed3..faf943c 100755 --- a/seqs/mailserver.sh +++ b/seqs/mailserver.sh @@ -222,7 +222,7 @@ step_21() { for mtaFile in ${mtaMysqlFiles[@]} ; do mtaVar="MAS_${mtaFile}" info "creating ${mtaFile}.cf" - exep echo -e "${MAS_VIRTUAL_USER_PART:?}\n${!mtaVar:?}" \> "$mtaMysqlConfLoc/${mtaFile}.cf" + exep echo -e "\"${MAS_VIRTUAL_USER_PART:?}\\n${!mtaVar:?}\"" \> \"$mtaMysqlConfLoc/${mtaFile}.cf\" done exe chown -R root:${mtaUser} "$mtaMysqlConfLoc" @@ -428,7 +428,7 @@ step_100() { done [ -n "${1:-}" ] && toAdr="$1" - exe ${asUser}sh -c "echo \"Subject: Test from Postfix\nIt is \$(date)\n\nGreetings \$(whoami)\" | sendmail ${fromAdr}$toAdr" + exe ${asUser}sh -c "echo \"Subject: Test from Postfix\nIt is \$(date)\n\nGreetings \$(whoami)\" | sendmail ${fromAdr:-}${toAdr}" } step_102_info() { echo "Show mail queue"; } diff --git a/sequencer.sh b/sequencer.sh index 8d3aafb..1e920d7 100755 --- a/sequencer.sh +++ b/sequencer.sh @@ -919,7 +919,7 @@ addConf() { return 0 else sqr::echo "nok" - warnign -e "backup exists" + warning -e "backup exists" fi fi else