sequencer - fix type
mailserver - fix escaping
This commit is contained in:
@@ -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"; }
|
||||
|
@@ -919,7 +919,7 @@ addConf() {
|
||||
return 0
|
||||
else
|
||||
sqr::echo "nok"
|
||||
warnign -e "backup exists"
|
||||
warning -e "backup exists"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
|
Reference in New Issue
Block a user