mir/docker-mailserver
2
0
Fork 0
mirror of https://github.com/tomav/docker-mailserver synced 2025-08-31 06:15:28 +00:00
Code Issues Releases Wiki Activity

chore(housekeeping): Normalize how config files filter out unwanted lines (#2619)

Browse Source 
* chore(`aliases.sh`): Filepath to local var `DATABASE_VIRTUAL`

* chore(`accounts.sh`): Filepath to local var `DATABASE_ACCOUNTS`

* chore(`accounts.sh`): Filepath to local var `DATABASE_VIRTUAL`

* chore(`accounts.sh`): Filepath to local var `DATABASE_DOVECOT_MASTERS`

* chore(`bin/open-dkim`): Filepaths to local vars (accounts,virtual,vhost)

* chore(`relay.sh`): Filepath to local var `DATABASE_SASL_PASSWD`

* chore: Rename method

Prior PR feedback suggested a better helper method name.

* chore: Normalize filtering config lines as input for iterating

* chore: Remove `_is_comment` helper method

No longer serving a purpose with more appropriate filter method for pre-processing the entire config file.
This commit is contained in:
Brennan Kinney
2022-06-07 01:07:30 +12:00
committed by GitHub
parent fa8bfdc22a
commit 54904aa02c
9 changed files with 51 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
target/scripts/startup/setup-stack.sh
View File

@@ -1162,8 +1162,7 @@ function _setup_fetchmail_parallel
# Just the server settings that need to be added to the specific rc.d file
echo "${LINE}" >>"${FETCHMAILRCD}/fetchmail-${COUNTER}.rc"
fi
# delete commented lines before parsing
done < <(sed '/^[[:space:]]*#/d' "${FETCHMAILRC}")
done < <(_get_valid_lines_from_file "${FETCHMAILRC}")
rm "${DEFAULT_FILE}"
}