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

114
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,66 +226,68 @@ validate_exit $?
# ------------ Mail server -------------- # ------------ Mail server --------------
MAILER_DSN='sendmail://localhost' MAILER_DSN='sendmail://localhost'
if echo "${DOCKER}" | grep -Fvq '"mail"'; then if false; then
while true; do if echo "${DOCKER}" | grep -Fvq '"mail"'; then
MAILER_DSN=$(${WHIPTAIL} --title 'GNU social mail server DSN' --clear --backtitle 'GNU social' \ while true; do
--inputbox "\nEnter a DSN/URL social will use to connect to the mail server" 0 0 "${MAILER_DSN}" \ MAILER_DSN=$(${WHIPTAIL} --title 'GNU social mail server DSN' --clear --backtitle 'GNU social' \
3>&1 1>&2 2>&3) --inputbox "\nEnter a DSN/URL social will use to connect to the mail server" 0 0 "${MAILER_DSN}" \
validate_exit $? 3>&1 1>&2 2>&3)
if [ -n "${MAILER_DSN}" ]; then break; fi validate_exit $?
done if [ -n "${MAILER_DSN}" ]; then break; fi
while true; do done
MAIL_DOMAIN=$(${WHIPTAIL} --title 'GNU social mail server domain' --clear --backtitle 'GNU social' \ while true; do
--inputbox "\nEnter the domain social will use to serve mail" 0 0 "${DOMAIN_ROOT}" \ MAIL_DOMAIN=$(${WHIPTAIL} --title 'GNU social mail server domain' --clear --backtitle 'GNU social' \
3>&1 1>&2 2>&3) --inputbox "\nEnter the domain social will use to serve mail" 0 0 "${DOMAIN_ROOT}" \
validate_exit $? 3>&1 1>&2 2>&3)
if [ -n "${MAIL_DOMAIN}" ]; then break; fi validate_exit $?
done if [ -n "${MAIL_DOMAIN}" ]; then break; fi
fi done
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}" \
3>&1 1>&2 2>&3)
validate_exit $?
if [ -n "${MAIL_DOMAIN_ROOT}" ]; then break; fi
done
MAIL_SUBDOMAIN=$(${WHIPTAIL} --title 'GNU social mail server subdomain' --clear --backtitle 'GNU social' \
--inputbox "\nEnter a subdomain social will send email from (optional, can be empty)" 0 0 \
3>&1 1>&2 2>&3)
validate_exit $?
if [ -z "${MAIL_SUBDOMAIN}" ]; then
MAIL_DOMAIN="${MAIL_DOMAIN_ROOT}"
else
MAIL_DOMAIN="${MAIL_SUBDOMAIN}.${MAIL_DOMAIN_ROOT}"
fi fi
while true; do if echo "${DOCKER}" | grep -Fq '"mail"'; then
MAIL_SENDER_USER=$(${WHIPTAIL} --title 'GNU social mail sender user' --clear --backtitle 'GNU social' \ while true; do
--inputbox "\nEnter the user emails should be sent from (email without @domain)" 0 0 \ MAIL_DOMAIN_ROOT=$(${WHIPTAIL} --title 'GNU social mail server domain' --clear --backtitle 'GNU social' \
3>&1 1>&2 2>&3) --inputbox "\nEnter the root domain social will use to serve mail" 0 0 "${DOMAIN_ROOT}" \
validate_exit $? 3>&1 1>&2 2>&3)
if [ -n "${MAIL_SENDER_USER}" ]; then break; fi validate_exit $?
done if [ -n "${MAIL_DOMAIN_ROOT}" ]; then break; fi
done
while true; do MAIL_SUBDOMAIN=$(${WHIPTAIL} --title 'GNU social mail server subdomain' --clear --backtitle 'GNU social' \
MAIL_SENDER_NAME=$(${WHIPTAIL} --title 'GNU social mail sender name' --clear --backtitle 'GNU social' \ --inputbox "\nEnter a subdomain social will send email from (optional, can be empty)" 0 0 \
--inputbox "\nEnter the name emails should be sent from" 0 0 "${NODE_NAME}" \ 3>&1 1>&2 2>&3)
3>&1 1>&2 2>&3)
validate_exit $? validate_exit $?
if [ -n "${MAIL_SENDER_NAME}" ]; then break; fi
done
while true; do if [ -z "${MAIL_SUBDOMAIN}" ]; then
MAIL_PASSWORD=$(${WHIPTAIL} --title 'GNU social mail password' --clear --backtitle 'GNU social' \ MAIL_DOMAIN="${MAIL_DOMAIN_ROOT}"
--passwordbox "\nEnter a password for the user in the mail server" 0 0 \ else
3>&1 1>&2 2>&3) MAIL_DOMAIN="${MAIL_SUBDOMAIN}.${MAIL_DOMAIN_ROOT}"
validate_exit $? fi
if [ -n "${MAIL_PASSWORD}" ]; then break; fi
done while true; do
MAIL_SENDER_USER=$(${WHIPTAIL} --title 'GNU social mail sender user' --clear --backtitle 'GNU social' \
--inputbox "\nEnter the user emails should be sent from (email without @domain)" 0 0 \
3>&1 1>&2 2>&3)
validate_exit $?
if [ -n "${MAIL_SENDER_USER}" ]; then break; fi
done
while true; do
MAIL_SENDER_NAME=$(${WHIPTAIL} --title 'GNU social mail sender name' --clear --backtitle 'GNU social' \
--inputbox "\nEnter the name emails should be sent from" 0 0 "${NODE_NAME}" \
3>&1 1>&2 2>&3)
validate_exit $?
if [ -n "${MAIL_SENDER_NAME}" ]; then break; fi
done
while true; do
MAIL_PASSWORD=$(${WHIPTAIL} --title 'GNU social mail password' --clear --backtitle 'GNU social' \
--passwordbox "\nEnter a password for the user in the mail server" 0 0 \
3>&1 1>&2 2>&3)
validate_exit $?
if [ -n "${MAIL_PASSWORD}" ]; then break; fi
done
fi
fi fi
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------