mirror of
https://github.com/docker-mailserver/docker-mailserver.git
synced 2024-01-19 02:48:50 +00:00
57aeb6db2a
See the associated PR for more detailed commentary on specific changes.
### Commands refactored:
- User (**All:** add / list / update / del + _dovecot-master variants_)
- Quota (**All:** set / del)
- Virtual Alias (**All:** add / list /del)
- Relay (**All:** add-relayhost / add-sasl / exclude-domain)
### Overall changes involve:
- **Fairly common structure:**
- `_main` method at the top provides an overview of logical steps:
- After all methods are declared beneath it (_and imported from the new `helpers/database/db.sh`_), the `_main` is called at the bottom of the file.
- `delmailuser` additionally processes option support for `-y` prior to calling `_main`.
- `__usage` is now consistent with each of these commands, along with the `help` command.
- Most logic delegated to new helper scripts. Some duplicate content remains on the basis that it's low-risk to maintenance and avoids less hassle to jump between files to check a single line, usually this is arg validation.
- Error handling should be more consistent, along with var names (_no more `USER`/`EMAIL`/`FULL_EMAIL` to refer to the same expected value_).
- **Three new management scripts** (in `helpers/database/manage/`) using a common structure for managing changes to their respective "Database" config file.
- `postfix-accounts.sh` unified not only add and update commands, but also all the dovecot-master versions, a single password call for all 4 of them, with a 5th consumer of the password prompt from the relay command `addsaslpassword`.
- These scripts delegate actual writes to `helpers/database/db.sh` which provides a common API to support the changes made.
- This is more verbose/complex vs the current inline operations each command currently has, as it provides generic support instead of slightly different variations being maintained, along with handling some edge cases that existed and would lead to bugs (notably substring matches).
- Centralizing changes here seems wiser than scattered about. I've tried to make it easy to grok, hopefully it's not worse than the current situation.
- List operations were kept in their respective commands, `db.sh` is only really managing writes. I didn't see a nice way for removing the code duplication for list commands as the duplication was fairly minimal, especially for `listalias` and `listdovecotmasteruser` which were quite simple in their differences in the loop body.
- `listmailuser` and `delmailuser` also retain methods exclusive to respective commands, I wasn't sure if there was any benefit to move those, but they were refactored.
63 lines
2 KiB
Bash
Executable file
63 lines
2 KiB
Bash
Executable file
#! /bin/bash
|
|
|
|
# shellcheck source=../scripts/helpers/index.sh
|
|
source /usr/local/bin/helpers/index.sh
|
|
|
|
function _main
|
|
{
|
|
[[ ${1:-} == 'help' ]] && { __usage ; exit 0 ; }
|
|
|
|
local DOMAIN="${1}"
|
|
[[ -z ${DOMAIN} ]] && { __usage ; _exit_with_error 'No domain specified' ; }
|
|
|
|
_exclude_domain_from_relayhosts
|
|
}
|
|
|
|
function __usage
|
|
{
|
|
printf '%s' "${PURPLE}excluderelayhost${RED}(${YELLOW}8${RED})
|
|
|
|
${ORANGE}USAGE${RESET}
|
|
./setup.sh relay exclude-domain <SENDER DOMAIN>
|
|
|
|
${ORANGE}OPTIONS${RESET}
|
|
${BLUE}Generic Program Information${RESET}
|
|
help Print the usage information.
|
|
|
|
${ORANGE}DESCRIPTION${RESET}
|
|
When a default relay-host is configured (via ENV), the default behaviour
|
|
is to relay all your mail accounts outgoing mail through that service.
|
|
|
|
This command allows to opt-out from that default behaviour by excluding
|
|
all mail accounts belonging to a hosted domain you specify.
|
|
|
|
${ORANGE}EXAMPLES${RESET}
|
|
${LWHITE}./setup.sh relay exclude-domain example.com${RESET}
|
|
Any mail submitted from your '@example.com' accounts will be sent
|
|
without relaying through a default relay-host (if one was configured).
|
|
|
|
${ORANGE}EXIT STATUS${RESET}
|
|
Exit status is 0 if command was successful. If wrong arguments are provided
|
|
or arguments contain errors, the script will exit early with exit status 1.
|
|
|
|
"
|
|
}
|
|
|
|
# Config is for sender dependent relay-host mapping,
|
|
# excludes appending a sender from the real generated mapping in `helpers/relay.sh`.
|
|
function _exclude_domain_from_relayhosts
|
|
{
|
|
local SENDER="@${DOMAIN}"
|
|
local DATABASE_RELAY='/tmp/docker-mailserver/postfix-relaymap.cf'
|
|
|
|
# NOTE: No third arg is required.
|
|
# This won't cause any problems, a 'space' will be added with the key.
|
|
# That helps ensure repeat DB edits for the entry match correctly.
|
|
#
|
|
# `helpers/relay.sh` is also fine with this, and will eventually drop
|
|
# the need for this command entirely once that helper is refactored.
|
|
_db_entry_add_or_replace "${DATABASE_RELAY}" "${SENDER}"
|
|
}
|
|
|
|
_main "${@}"
|