efelon/shell_sequencer
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

sequencer - fix type

Browse Source 
mailserver - fix escaping
This commit is contained in:
Martin Winkler
2022-12-04 23:38:01 +01:00
parent 770d1dd63c
commit 38f39a51f7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
seqs/mailserver.sh
View File

@@ -222,7 +222,7 @@ step_21() {
for mtaFile in ${mtaMysqlFiles[@]} ; do for mtaFile in ${mtaMysqlFiles[@]} ; do
mtaVar="MAS_${mtaFile}" mtaVar="MAS_${mtaFile}"
info "creating ${mtaFile}.cf" 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 done
exe chown -R root:${mtaUser} "$mtaMysqlConfLoc" exe chown -R root:${mtaUser} "$mtaMysqlConfLoc"
@@ -428,7 +428,7 @@ step_100() {
done done
[ -n "${1:-}" ] && toAdr="$1" [ -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"; } step_102_info() { echo "Show mail queue"; }

2
sequencer.sh
View File

@@ -919,7 +919,7 @@ addConf() {
return 0 return 0
else else
sqr::echo "nok" sqr::echo "nok"
warnign -e "backup exists" warning -e "backup exists"
fi fi
fi fi
else else