forked from GNUsocial/gnu-social
[DOCKER][MAIL] Temporarily disable mail container
This commit is contained in:
parent
349df02f78
commit
f912236114
15
.gitignore
vendored
15
.gitignore
vendored
@ -29,10 +29,19 @@
|
||||
DOCUMENTATION/database/*
|
||||
!DOCUMENTATION/database/database.pdf
|
||||
|
||||
docker/certbot/*
|
||||
!docker/certbot/docker-compose.fragment.sh
|
||||
docker/certbot/.files
|
||||
docker/certbot/www
|
||||
docker/*/*.env
|
||||
docker/mail/config/*
|
||||
|
||||
docker/mail/etc/hostname
|
||||
docker/mail/etc/hosts
|
||||
docker/mail/etc/resolv.conf
|
||||
docker/mail/config/aliases.db
|
||||
docker/mail/config/domains.db
|
||||
docker/mail/config/mailboxes.db
|
||||
docker/mail/config/passwd.db
|
||||
docker/mail/etc/service/*
|
||||
!docker/mail/etc/service/*/run
|
||||
|
||||
docker-compose.yaml
|
||||
composer.local.json
|
||||
|
10
bin/configure
vendored
10
bin/configure
vendored
@ -47,7 +47,7 @@ Choose whether you prefer social to handle all the services it needs though dock
|
||||
3>&1 1>&2 2>&3)
|
||||
validate_exit $?
|
||||
case ${SERVICES} in
|
||||
'docker') DOCKER='"nginx" "certbot" "php" "db" "redis" "mail"' ;;
|
||||
'docker') DOCKER='"nginx" "certbot" "php" "db" "redis"' ;; # TODO enable and configure "mail"
|
||||
'mixed')
|
||||
DOCKER=$(${WHIPTAIL} --title 'GNU social Docker services' --clear --backtitle 'GNU social' \
|
||||
--checklist "\nPick which of the following services you'd like to add to docker-compose.\n* indicates a service that has extra configuration" 0 0 0 \
|
||||
@ -226,7 +226,8 @@ validate_exit $?
|
||||
|
||||
# ------------ Mail server --------------
|
||||
MAILER_DSN='sendmail://localhost'
|
||||
if echo "${DOCKER}" | grep -Fvq '"mail"'; then
|
||||
if false; then
|
||||
if echo "${DOCKER}" | grep -Fvq '"mail"'; then
|
||||
while true; do
|
||||
MAILER_DSN=$(${WHIPTAIL} --title 'GNU social mail server DSN' --clear --backtitle 'GNU social' \
|
||||
--inputbox "\nEnter a DSN/URL social will use to connect to the mail server" 0 0 "${MAILER_DSN}" \
|
||||
@ -241,9 +242,9 @@ if echo "${DOCKER}" | grep -Fvq '"mail"'; then
|
||||
validate_exit $?
|
||||
if [ -n "${MAIL_DOMAIN}" ]; then break; fi
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
if echo "${DOCKER}" | grep -Fq '"mail"'; then
|
||||
if echo "${DOCKER}" | grep -Fq '"mail"'; then
|
||||
while true; do
|
||||
MAIL_DOMAIN_ROOT=$(${WHIPTAIL} --title 'GNU social mail server domain' --clear --backtitle 'GNU social' \
|
||||
--inputbox "\nEnter the root domain social will use to serve mail" 0 0 "${DOMAIN_ROOT}" \
|
||||
@ -286,6 +287,7 @@ if echo "${DOCKER}" | grep -Fq '"mail"'; then
|
||||
validate_exit $?
|
||||
if [ -n "${MAIL_PASSWORD}" ]; then break; fi
|
||||
done
|
||||
fi
|
||||
fi
|
||||
# --------------------------------------------------------------------------
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user