From 3ef1077f90ec386167cc399c7579cad25298d0d3 Mon Sep 17 00:00:00 2001 From: Diogo Peralta Cordeiro Date: Thu, 23 Sep 2021 15:47:28 +0100 Subject: [PATCH] [DOCKER] TODOify mail server certificate --- docker/bootstrap/bootstrap.sh | 7 +++++-- docker/nginx/domain.sh | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docker/bootstrap/bootstrap.sh b/docker/bootstrap/bootstrap.sh index ea0491233f..1019149522 100755 --- a/docker/bootstrap/bootstrap.sh +++ b/docker/bootstrap/bootstrap.sh @@ -5,7 +5,9 @@ . bootstrap.env -sed -ri "s/%hostname%/${MAIL_DOMAIN}/" /etc/nginx/conf.d/challenge.conf +# TODO: Add mail domain when implemented +rm -f /etc/nginx/conf.d/default.conf +sed -ri "s/%hostname%/${WEB_DOMAIN}/" /etc/nginx/conf.d/challenge.conf nginx @@ -59,4 +61,5 @@ obtain_certificates () { } obtain_certificates "${WEB_DOMAIN}" -obtain_certificates "${MAIL_DOMAIN}" +#TODO: Uncomment when implemented (: +#obtain_certificates "${MAIL_DOMAIN}" diff --git a/docker/nginx/domain.sh b/docker/nginx/domain.sh index 504624f34d..db09c52530 100755 --- a/docker/nginx/domain.sh +++ b/docker/nginx/domain.sh @@ -2,7 +2,7 @@ # There's no point in keeping default nginx conf # Furthermore, this is an issue when a developer is using localhost as the instance domain -rm /etc/nginx/conf.d/default.conf +rm -f /etc/nginx/conf.d/default.conf # Can't do sed inplace, because the file would be busy cat /var/nginx/social.conf | \