chore: Drop `setup.sh` DATABASE fallback ENV (#2556)
* chore: Remove `DATABASE` fallback ENV This was introduced without any mention or need, thus removing until a real use-case requires it. * chore: Remove `USER_DATABASE` fallback ENV Likewise, nothing requires this to be customizable. * chore: Consistently use single quote strings
This commit is contained in:
parent
cbcc3823d3
commit
182b71d33f
|
@ -3,7 +3,7 @@
|
||||||
# shellcheck source=../scripts/helpers/index.sh
|
# shellcheck source=../scripts/helpers/index.sh
|
||||||
source /usr/local/bin/helpers/index.sh
|
source /usr/local/bin/helpers/index.sh
|
||||||
|
|
||||||
DATABASE=${DATABASE:-/tmp/docker-mailserver/postfix-virtual.cf}
|
DATABASE='/tmp/docker-mailserver/postfix-virtual.cf'
|
||||||
|
|
||||||
function __usage
|
function __usage
|
||||||
{
|
{
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
# shellcheck source=../scripts/helpers/index.sh
|
# shellcheck source=../scripts/helpers/index.sh
|
||||||
source /usr/local/bin/helpers/index.sh
|
source /usr/local/bin/helpers/index.sh
|
||||||
|
|
||||||
DATABASE=${DATABASE:-/tmp/docker-mailserver/postfix-accounts.cf}
|
DATABASE='/tmp/docker-mailserver/postfix-accounts.cf'
|
||||||
|
|
||||||
function __usage
|
function __usage
|
||||||
{
|
{
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
# shellcheck source=../scripts/helpers/index.sh
|
# shellcheck source=../scripts/helpers/index.sh
|
||||||
source /usr/local/bin/helpers/index.sh
|
source /usr/local/bin/helpers/index.sh
|
||||||
|
|
||||||
DATABASE=${DATABASE:-/tmp/docker-mailserver/postfix-relaymap.cf}
|
DATABASE='/tmp/docker-mailserver/postfix-relaymap.cf'
|
||||||
|
|
||||||
function __usage
|
function __usage
|
||||||
{
|
{
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
# shellcheck source=../scripts/helpers/index.sh
|
# shellcheck source=../scripts/helpers/index.sh
|
||||||
source /usr/local/bin/helpers/index.sh
|
source /usr/local/bin/helpers/index.sh
|
||||||
|
|
||||||
DATABASE=${DATABASE:-/tmp/docker-mailserver/postfix-sasl-password.cf}
|
DATABASE='/tmp/docker-mailserver/postfix-sasl-password.cf'
|
||||||
|
|
||||||
function __usage { echo "Usage: addsaslpassword <domain> <username> <password>" ; }
|
function __usage { echo "Usage: addsaslpassword <domain> <username> <password>" ; }
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
# shellcheck source=../scripts/helpers/index.sh
|
# shellcheck source=../scripts/helpers/index.sh
|
||||||
source /usr/local/bin/helpers/index.sh
|
source /usr/local/bin/helpers/index.sh
|
||||||
|
|
||||||
DATABASE=${DATABASE:-/tmp/docker-mailserver/postfix-virtual.cf}
|
DATABASE='/tmp/docker-mailserver/postfix-virtual.cf'
|
||||||
|
|
||||||
EMAIL="${1}"
|
EMAIL="${1}"
|
||||||
RECIPIENT="${2}"
|
RECIPIENT="${2}"
|
||||||
|
|
|
@ -8,10 +8,10 @@
|
||||||
# shellcheck source=../scripts/helpers/index.sh
|
# shellcheck source=../scripts/helpers/index.sh
|
||||||
source /usr/local/bin/helpers/index.sh
|
source /usr/local/bin/helpers/index.sh
|
||||||
|
|
||||||
DATABASE=${DATABASE:-/tmp/docker-mailserver/postfix-accounts.cf}
|
DATABASE='/tmp/docker-mailserver/postfix-accounts.cf'
|
||||||
ALIAS_DATABASE="/tmp/docker-mailserver/postfix-virtual.cf"
|
ALIAS_DATABASE='/tmp/docker-mailserver/postfix-virtual.cf'
|
||||||
QUOTA_DATABASE="/tmp/docker-mailserver/dovecot-quotas.cf"
|
QUOTA_DATABASE='/tmp/docker-mailserver/dovecot-quotas.cf'
|
||||||
MAILDEL=false
|
MAILDEL='false'
|
||||||
|
|
||||||
function __usage
|
function __usage
|
||||||
{
|
{
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
# shellcheck source=../scripts/helpers/index.sh
|
# shellcheck source=../scripts/helpers/index.sh
|
||||||
source /usr/local/bin/helpers/index.sh
|
source /usr/local/bin/helpers/index.sh
|
||||||
|
|
||||||
DATABASE=${DATABASE:-/tmp/docker-mailserver/dovecot-quotas.cf}
|
DATABASE='/tmp/docker-mailserver/dovecot-quotas.cf'
|
||||||
USER_DATABASE=${USER_DATABASE:-/tmp/docker-mailserver/postfix-accounts.cf}
|
USER_DATABASE='/tmp/docker-mailserver/postfix-accounts.cf'
|
||||||
|
|
||||||
function __usage { echo 'Usage: delquota <username@domain>' ; }
|
function __usage { echo 'Usage: delquota <username@domain>' ; }
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
# shellcheck source=../scripts/helpers/index.sh
|
# shellcheck source=../scripts/helpers/index.sh
|
||||||
source /usr/local/bin/helpers/index.sh
|
source /usr/local/bin/helpers/index.sh
|
||||||
|
|
||||||
DATABASE=${DATABASE:-/tmp/docker-mailserver/postfix-relaymap.cf}
|
DATABASE='/tmp/docker-mailserver/postfix-relaymap.cf'
|
||||||
|
|
||||||
DOMAIN="${1}"
|
DOMAIN="${1}"
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
# shellcheck source=../scripts/helpers/index.sh
|
# shellcheck source=../scripts/helpers/index.sh
|
||||||
source /usr/local/bin/helpers/index.sh
|
source /usr/local/bin/helpers/index.sh
|
||||||
|
|
||||||
DATABASE=${DATABASE:-/tmp/docker-mailserver/postfix-virtual.cf}
|
DATABASE='/tmp/docker-mailserver/postfix-virtual.cf'
|
||||||
|
|
||||||
[[ -f ${DATABASE} ]] || _exit_with_error "No 'postfix-virtual.cf' file"
|
[[ -f ${DATABASE} ]] || _exit_with_error "No 'postfix-virtual.cf' file"
|
||||||
[[ -s ${DATABASE} ]] || _exit_with_error "Empty 'postfix-virtual.cf' - no aliases have been added"
|
[[ -s ${DATABASE} ]] || _exit_with_error "Empty 'postfix-virtual.cf' - no aliases have been added"
|
||||||
|
|
|
@ -8,8 +8,8 @@
|
||||||
# shellcheck source=../scripts/helpers/index.sh
|
# shellcheck source=../scripts/helpers/index.sh
|
||||||
source /usr/local/bin/helpers/index.sh
|
source /usr/local/bin/helpers/index.sh
|
||||||
|
|
||||||
DATABASE=${DATABASE:-/tmp/docker-mailserver/dovecot-quotas.cf}
|
DATABASE='/tmp/docker-mailserver/dovecot-quotas.cf'
|
||||||
USER_DATABASE=${USER_DATABASE:-/tmp/docker-mailserver/postfix-accounts.cf}
|
USER_DATABASE='/tmp/docker-mailserver/postfix-accounts.cf'
|
||||||
|
|
||||||
USER="${1}"
|
USER="${1}"
|
||||||
shift
|
shift
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
# shellcheck source=../scripts/helpers/index.sh
|
# shellcheck source=../scripts/helpers/index.sh
|
||||||
source /usr/local/bin/helpers/index.sh
|
source /usr/local/bin/helpers/index.sh
|
||||||
|
|
||||||
DATABASE=${DATABASE:-/tmp/docker-mailserver/postfix-accounts.cf}
|
DATABASE='/tmp/docker-mailserver/postfix-accounts.cf'
|
||||||
|
|
||||||
USER="${1}"
|
USER="${1}"
|
||||||
shift
|
shift
|
||||||
|
|
Loading…
Reference in New Issue