From ca42c867cd49260626636763e37cba37e28bdb4b Mon Sep 17 00:00:00 2001
From: Ricardo Paes <ricardo@likesistemas.com.br>
Date: Tue, 15 Feb 2022 14:54:21 -0300
Subject: [PATCH] Fixing nginx configuration when `server_name` is not passed

---
 frontend/.docker/add-env-vars.sh                |  1 +
 frontend/.docker/nginx/conf.d/default.conf      | 17 ++++++++++++-----
 .../.docker/nginx/include.d/ssl-redirect.conf   |  5 +++++
 frontend/.docker/nginx/sites.d/backend.conf     |  2 +-
 frontend/.docker/nginx/sites.d/frontend.conf    |  2 +-
 5 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 frontend/.docker/nginx/include.d/ssl-redirect.conf

diff --git a/frontend/.docker/add-env-vars.sh b/frontend/.docker/add-env-vars.sh
index 4449379..715607c 100644
--- a/frontend/.docker/add-env-vars.sh
+++ b/frontend/.docker/add-env-vars.sh
@@ -19,6 +19,7 @@ _addSslConfig() {
         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 4aab70f..1d6954e 100755
--- a/frontend/.docker/nginx/conf.d/default.conf
+++ b/frontend/.docker/nginx/conf.d/default.conf
@@ -1,20 +1,27 @@
+include include.d/ssl-redirect.conf;
+
 upstream backend {
     server {{ .Env.URL_BACKEND }};
 }
 
 server {
-    listen 80;
     index index.html;
     root /var/www/public/;
 
-    server_name {{ default .Env.FRONTEND_SERVER_NAME "_" }};
+    {{ if .Env.FRONTEND_SERVER_NAME }}
+    server_name {{ .Env.FRONTEND_SERVER_NAME }};
+    {{else}}
+    server_name _;
+    {{end}}
+
     include sites.d/frontend.conf;
     include include.d/letsencrypt.conf;
 }
 
+{{if .Env.BACKEND_SERVER_NAME}}
 server {
-    listen 80;
-    server_name {{ default .Env.BACKEND_SERVER_NAME "_" }};
+    server_name {{ .Env.BACKEND_SERVER_NAME }};
     include sites.d/backend.conf;
     include include.d/letsencrypt.conf;
-}
\ No newline at end of file
+}
+{{end}}
\ No newline at end of file
diff --git a/frontend/.docker/nginx/include.d/ssl-redirect.conf b/frontend/.docker/nginx/include.d/ssl-redirect.conf
new file mode 100644
index 0000000..1684eb6
--- /dev/null
+++ b/frontend/.docker/nginx/include.d/ssl-redirect.conf
@@ -0,0 +1,5 @@
+server {
+	listen         80;
+	listen    [::]:80;
+	return         302 https://$host$request_uri;
+}
\ No newline at end of file
diff --git a/frontend/.docker/nginx/sites.d/backend.conf b/frontend/.docker/nginx/sites.d/backend.conf
index 72b4d57..a503ee1 100644
--- a/frontend/.docker/nginx/sites.d/backend.conf
+++ b/frontend/.docker/nginx/sites.d/backend.conf
@@ -8,4 +8,4 @@ location / {
     proxy_set_header X-Forwarded-Proto $scheme;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_cache_bypass $http_upgrade;
-}
\ No newline at end of file
+}
diff --git a/frontend/.docker/nginx/sites.d/frontend.conf b/frontend/.docker/nginx/sites.d/frontend.conf
index de604eb..9813e24 100755
--- a/frontend/.docker/nginx/sites.d/frontend.conf
+++ b/frontend/.docker/nginx/sites.d/frontend.conf
@@ -8,4 +8,4 @@ location /static {
    include include.d/allcache.conf;
 }
 
-include "include.d/spa.conf";
\ No newline at end of file
+include "include.d/spa.conf";