Archive-Team
/
docker-mailserver
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: `postfix.sh` - `FIRST_FIELD` => More descriptive field name

This commit is contained in:
Brennan Kinney 2024-01-31 01:44:53 +13:00 committed by GitHub
parent 78f1521722
commit 22bac611fe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
target/scripts/helpers/postfix.sh
View File

@ -45,9 +45,9 @@ function _vhost_collect_postfix_domains() {
# Extract domains from mail accounts: # Extract domains from mail accounts:
if [[ -f ${DATABASE_ACCOUNTS} ]]; then if [[ -f ${DATABASE_ACCOUNTS} ]]; then
while IFS=$'|' read -r FIRST_FIELD _; do while IFS=$'|' read -r MAIL_ACCOUNT _; do
# It is expected valid lines have the format local-part@domain-part: # It is expected valid lines have the format local-part@domain-part:
DOMAIN=$(cut -d '@' -f 2 <<< "${FIRST_FIELD}") DOMAIN=$(cut -d '@' -f 2 <<< "${MAIL_ACCOUNT}")
echo "${DOMAIN}" >>"${TMP_VHOST}" echo "${DOMAIN}" >>"${TMP_VHOST}"
done < <(_get_valid_lines_from_file "${DATABASE_ACCOUNTS}") done < <(_get_valid_lines_from_file "${DATABASE_ACCOUNTS}")
@ -58,9 +58,9 @@ function _vhost_collect_postfix_domains() {
# Extract domains from virtual alias config: # Extract domains from virtual alias config:
# Aliases may have the forms: 'local-part@domain-part', only 'local-part', or '@domain-part' (wildcard catch-all) # Aliases may have the forms: 'local-part@domain-part', only 'local-part', or '@domain-part' (wildcard catch-all)
if [[ -f ${DATABASE_VIRTUAL} ]]; then if [[ -f ${DATABASE_VIRTUAL} ]]; then
while read -r FIRST_FIELD _; do while read -r ALIAS_FIELD _; do
UNAME=$(cut -d '@' -f 1 <<< "${FIRST_FIELD}") UNAME=$(cut -d '@' -f 1 <<< "${ALIAS_FIELD}")
DOMAIN=$(cut -d '@' -f 2 <<< "${FIRST_FIELD}") DOMAIN=$(cut -d '@' -f 2 <<< "${ALIAS_FIELD}")
# Only add valid domain-parts found: # Only add valid domain-parts found:
# The '@' is optional for an alias key (eg: "user1 other@domain.tld"), # The '@' is optional for an alias key (eg: "user1 other@domain.tld"),