diff --git a/frontend/.docker/add-env-vars.sh b/frontend/.docker/add-env-vars.sh index 4449379..e42efe0 100644 --- a/frontend/.docker/add-env-vars.sh +++ b/frontend/.docker/add-env-vars.sh @@ -12,13 +12,16 @@ _addSslConfig() { SSL_CERTIFICATE=/etc/nginx/ssl/${1}/fullchain.pem; SSL_CERTIFICATE_KEY=/etc/nginx/ssl/${1}/privkey.pem; FILE_CONF=/etc/nginx/sites.d/${1}.conf + FILE_SSL_CONF=/etc/nginx/conf.d/00-ssl-redirect.conf; if [ -f ${SSL_CERTIFICATE} ] && [ -f ${SSL_CERTIFICATE_KEY} ]; then echo "saving ssl config in ${FILE_CONF}" + echo 'include include.d/ssl-redirect.conf;' >> ${FILE_SSL_CONF}; echo 'include "include.d/ssl.conf";' >> ${FILE_CONF}; echo "ssl_certificate ${SSL_CERTIFICATE};" >> ${FILE_CONF}; echo "ssl_certificate_key ${SSL_CERTIFICATE_KEY};" >> ${FILE_CONF}; else + echo 'listen 80;' >> ${FILE_CONF}; echo "ssl ${1} not found >> ${SSL_CERTIFICATE} -> ${SSL_CERTIFICATE_KEY}" fi; } diff --git a/frontend/.docker/nginx/conf.d/default.conf b/frontend/.docker/nginx/conf.d/default.conf index 1d6954e..aaa8bac 100755 --- a/frontend/.docker/nginx/conf.d/default.conf +++ b/frontend/.docker/nginx/conf.d/default.conf @@ -1,5 +1,3 @@ -include include.d/ssl-redirect.conf; - upstream backend { server {{ .Env.URL_BACKEND }}; }