From a1a27922de92f9acde07b2553440df0bbd88e65c Mon Sep 17 00:00:00 2001
From: chowmean <gaurav.dev.iiitm@gmail.com>
Date: Sun, 26 Jul 2020 14:31:58 +0530
Subject: [PATCH 1/3] adding blocks for port 80 and 443 to fix bug for
 redirects

---
 nginx/config/entrypoint.sh | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/nginx/config/entrypoint.sh b/nginx/config/entrypoint.sh
index a1fea7a6..db91d42f 100644
--- a/nginx/config/entrypoint.sh
+++ b/nginx/config/entrypoint.sh
@@ -52,6 +52,9 @@ if [ "x${KIBANA_HOST}" = "x" ]; then
 fi
 
 echo "Configuring NGINX"
+
+
+if [ "${NGINX_PORT}" = "443" ]; then
 cat > /etc/nginx/conf.d/default.conf <<EOF
 server {
     listen 80;
@@ -74,5 +77,24 @@ server {
     }
 }
 EOF
+fi
+
+if [ "${NGINX_PORT}" = "80" ]; then
+cat > /etc/nginx/conf.d/default.conf <<EOF
+server {
+    listen 80;
+    listen [::]:80;
+    location / {
+        auth_basic "Restricted";
+        auth_basic_user_file /etc/nginx/conf.d/kibana.htpasswd;
+        proxy_pass http://${KIBANA_HOST}/;
+        proxy_buffer_size          128k;
+        proxy_buffers              4 256k;
+        proxy_busy_buffers_size    256k;
+    }
+}
+EOF
+fi
+
 
 exec nginx -g 'daemon off;'

From 0992111200e185acf4fb70f2f7197980691c612e Mon Sep 17 00:00:00 2001
From: Manuel Gutierrez <1380243+xr09@users.noreply.github.com>
Date: Wed, 2 Sep 2020 14:24:40 +0200
Subject: [PATCH 2/3] Allow any other ports on nginx config

---
 nginx/config/entrypoint.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/nginx/config/entrypoint.sh b/nginx/config/entrypoint.sh
index db91d42f..7b2bc305 100644
--- a/nginx/config/entrypoint.sh
+++ b/nginx/config/entrypoint.sh
@@ -77,13 +77,11 @@ server {
     }
 }
 EOF
-fi
-
-if [ "${NGINX_PORT}" = "80" ]; then
+else
 cat > /etc/nginx/conf.d/default.conf <<EOF
 server {
-    listen 80;
-    listen [::]:80;
+    listen ${NGINX_PORT};
+    listen [::]:${NGINX_PORT};
     location / {
         auth_basic "Restricted";
         auth_basic_user_file /etc/nginx/conf.d/kibana.htpasswd;
@@ -96,5 +94,4 @@ server {
 EOF
 fi
 
-
 exec nginx -g 'daemon off;'

From 86ff04c0b3633142029bd85348c15869327532fb Mon Sep 17 00:00:00 2001
From: Manuel Gutierrez <1380243+xr09@users.noreply.github.com>
Date: Wed, 2 Sep 2020 14:24:59 +0200
Subject: [PATCH 3/3] Omit port on ssl config

---
 nginx/config/entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx/config/entrypoint.sh b/nginx/config/entrypoint.sh
index 7b2bc305..2f4dcecc 100644
--- a/nginx/config/entrypoint.sh
+++ b/nginx/config/entrypoint.sh
@@ -59,7 +59,7 @@ cat > /etc/nginx/conf.d/default.conf <<EOF
 server {
     listen 80;
     listen [::]:80;
-    return 301 https://\$host:${NGINX_PORT}\$request_uri;
+    return 301 https://\$host\$request_uri;
 }
 
 server {