GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[DOCKER][MAIL] Temporarily disable mail container

Browse Source
This commit is contained in:
Hugo Sales 2021-03-25 22:02:41 +00:00
parent 1773ab7af2
commit 2e490756b9
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
2 changed files with 70 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.gitignore vendored
View File

@ -29,10 +29,19 @@
DOCUMENTATION/database/* DOCUMENTATION/database/*
!DOCUMENTATION/database/database.pdf !DOCUMENTATION/database/database.pdf
docker/certbot/* docker/certbot/.files
!docker/certbot/docker-compose.fragment.sh docker/certbot/www
docker/*/*.env 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 docker-compose.yaml
composer.local.json composer.local.json

10
bin/configure vendored
View File

@ -47,7 +47,7 @@ Choose whether you prefer social to handle all the services it needs though dock
3>&1 1>&2 2>&3) 3>&1 1>&2 2>&3)
validate_exit $? validate_exit $?
case ${SERVICES} in case ${SERVICES} in
'docker') DOCKER='"nginx" "certbot" "php" "db" "redis" "mail"' ;; 'docker') DOCKER='"nginx" "certbot" "php" "db" "redis"' ;; # TODO enable and configure "mail"
'mixed') 'mixed')
DOCKER=$(${WHIPTAIL} --title 'GNU social Docker services' --clear --backtitle 'GNU social' \ 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 \ --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 -------------- # ------------ Mail server --------------
MAILER_DSN='sendmail://localhost' MAILER_DSN='sendmail://localhost'
if echo "${DOCKER}" | grep -Fvq '"mail"'; then if false; then
if echo "${DOCKER}" | grep -Fvq '"mail"'; then
while true; do while true; do
MAILER_DSN=$(${WHIPTAIL} --title 'GNU social mail server DSN' --clear --backtitle 'GNU social' \ 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}" \ --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 $? validate_exit $?
if [ -n "${MAIL_DOMAIN}" ]; then break; fi if [ -n "${MAIL_DOMAIN}" ]; then break; fi
done done
fi fi
if echo "${DOCKER}" | grep -Fq '"mail"'; then if echo "${DOCKER}" | grep -Fq '"mail"'; then
while true; do while true; do
MAIL_DOMAIN_ROOT=$(${WHIPTAIL} --title 'GNU social mail server domain' --clear --backtitle 'GNU social' \ 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}" \ --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 $? validate_exit $?
if [ -n "${MAIL_PASSWORD}" ]; then break; fi if [ -n "${MAIL_PASSWORD}" ]; then break; fi
done done
fi
fi fi
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------