refactoring changes from sequpgrade (endReturn, ...) and some modernizations

This commit is contained in:
2023-01-03 15:49:08 +01:00
parent 215135e8aa
commit 3c22d5729f
69 changed files with 553 additions and 654 deletions

View File

@@ -30,7 +30,7 @@ seq_config() {
else
dry || return 1
fi
## Apt cmdline option to suppress user interaction
interactive || sq_aptOpt="-y"
@@ -195,7 +195,7 @@ step_9() {
MDA_EOF
}
step_20_info() {
step_20_info() {
echo "Install postfixadmin and create mysql database"
echoinfo "Virtualize mailboxes, domains and aliases by using a mysql database"
}
@@ -236,7 +236,7 @@ step_22() {
exe postconf -e "virtual_alias_maps = proxy:mysql:/etc/postfix/sql/mysql_virtual_alias_maps.cf, proxy:mysql:/etc/postfix/sql/mysql_virtual_alias_domain_maps.cf, proxy:mysql:/etc/postfix/sql/mysql_virtual_alias_domain_catchall_maps.cf"
exe postconf -e "virtual_transport = lmtp:unix:private/dovecot-lmtp"
# Apex domain removed, it is handled as virtual domain now
# Apex domain removed, it is handled as virtual domain now
exe postconf -e "mydestination = \$myhostname, localhost.\$mydomain, localhost"
# Base location for the virtual maildirs
exe postconf -e "virtual_mailbox_base = $MAS_VIRTUAL_FOLDER_BASE"
@@ -342,7 +342,7 @@ step_50() {
}
saslPassFile="$mtaConfLoc/sasl_password"
step_52_info() {
step_52_info() {
echo "Grant access for specific (local) hostnames"
echoinfo "Workaround when local clients connect to 25 with different ips (v6)"
}
@@ -361,7 +361,7 @@ step_52() {
}
mtaClientAccessLoc="$mtaConfLoc/client_access"
step_54_info() {
step_54_info() {
echo "Deny recipient access for listed mail addresses"
}
step_54_alias() { echo "recipient_access"; }
@@ -402,7 +402,7 @@ step_56() {
}
mtaSenderRelayLoc="$mtaConfLoc/sender_relay"
step_100_info() {
step_100_info() {
echo "Send testmail [-u SYSTEMUSER | -f FROM] [TO]"
echoinfo "Send as current user to postmaster@\$MAS_DOMAIN by default"
}