From e32fa07383eabf8d6f5103d5854451abd1681435 Mon Sep 17 00:00:00 2001
From: Mika Majakorpi <mika.majakorpi@nitor.com>
Date: Thu, 19 Mar 2020 20:26:55 +0200
Subject: [PATCH 1/2] Add health check path

---
 Dockerfile       |  3 ++-
 README.md        |  1 +
 default.conf.tpl | 20 ++++++++------------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4edb704..2bfa50d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,7 +31,7 @@ RUN wget -O dockerize.tar.gz https://github.com/jwilder/dockerize/releases/downl
 # --------------------
 # TEMPLATES
 # --------------------
-COPY default.conf.tpl nginx.conf.tpl /templates/
+COPY default.conf.tpl nginx.conf.tpl proxy.conf.tpl /templates/
 
 # --------------------
 # FILL TEMPLATES & GO
@@ -39,5 +39,6 @@ COPY default.conf.tpl nginx.conf.tpl /templates/
 CMD htpasswd -Bbn "$BASIC_AUTH_USERNAME" "$BASIC_AUTH_PASSWORD" > /etc/nginx/auth.htpasswd && \
   dockerize \
   -template /templates/default.conf.tpl:/etc/nginx/conf.d/default.conf \
+  -template /templates/proxy.conf.tpl:/etc/nginx/proxy.conf \
   -template /templates/nginx.conf.tpl:/etc/nginx/nginx.conf \
   nginx
diff --git a/README.md b/README.md
index 68d2ad1..b2d6965 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,7 @@ Configuration is provided using environment variables:
 | `PROXY_BUFFERING`         | Enables or disables buffering of responses from the proxied server | `on`          |
 | `WEBSOCKET_PATH`          | Activates websocket handling on the given path                     | (none)        |
 | `FORWARD_WEBSOCKET_PATH`  | If the remote path differs from `WEBSOCKET_PATH`, use this         | (none)        |
+| `HEALTH_PATH`             | For health checks. No authentication required on this path         | (none)        |
 
 
 ## Usage
diff --git a/default.conf.tpl b/default.conf.tpl
index 8bda140..5829d15 100644
--- a/default.conf.tpl
+++ b/default.conf.tpl
@@ -28,6 +28,13 @@ server {
     }
 {{ end }}
 
+{{ if .Env.HEALTH_PATH }}
+    location {{ .Env.HEALTH_PATH }} {
+        auth_basic "off";
+        include /etc/nginx/proxy.conf;
+    }
+{{ end }}
+
     location / {
 
         # Basic Auth
@@ -35,17 +42,6 @@ server {
             auth_basic "Restricted";
             auth_basic_user_file "auth.htpasswd";
         }
-
-        # Proxy
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
-        proxy_pass http://backend;
-        proxy_read_timeout {{ .Env.PROXY_READ_TIMEOUT }};
-        proxy_send_timeout {{ .Env.PROXY_SEND_TIMEOUT }};
-        client_max_body_size {{ .Env.CLIENT_MAX_BODY_SIZE }};
-        proxy_request_buffering {{ .Env.PROXY_REQUEST_BUFFERING }};
-        proxy_buffering {{ .Env.PROXY_BUFFERING }};
+        include /etc/nginx/proxy.conf;
     }
 }

From 7e33c3bd2e2568a4a227b14f81d808a14cff7e1f Mon Sep 17 00:00:00 2001
From: Mika Majakorpi <mika.majakorpi@nitor.com>
Date: Thu, 19 Mar 2020 20:41:23 +0200
Subject: [PATCH 2/2] add missing proxy.conf.tpl

---
 proxy.conf.tpl | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 proxy.conf.tpl

diff --git a/proxy.conf.tpl b/proxy.conf.tpl
new file mode 100644
index 0000000..b7b66d6
--- /dev/null
+++ b/proxy.conf.tpl
@@ -0,0 +1,11 @@
+# Proxy
+proxy_set_header Host $host;
+proxy_set_header X-Real-IP $remote_addr;
+proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
+proxy_pass http://backend;
+proxy_read_timeout {{ .Env.PROXY_READ_TIMEOUT }};
+proxy_send_timeout {{ .Env.PROXY_SEND_TIMEOUT }};
+client_max_body_size {{ .Env.CLIENT_MAX_BODY_SIZE }};
+proxy_request_buffering {{ .Env.PROXY_REQUEST_BUFFERING }};
+proxy_buffering {{ .Env.PROXY_BUFFERING }};