From 48724219b3cb2a8dd714b969a2480cbf2b79aab7 Mon Sep 17 00:00:00 2001
From: Michael Contento <mail@michaelcontento.de>
Date: Tue, 28 Mar 2017 20:13:15 +0200
Subject: [PATCH] add REDIRECT_SCHEME to support running this image behind a
 SSL-termination proxy

---
 Dockerfile                                          | 4 ++++
 etc/nginx/sites-available/redirect-apex-to-www.conf | 2 +-
 etc/nginx/sites-available/redirect-www-to-apex.conf | 2 +-
 usr/bin/docker-start                                | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index be8c1b5..c16e659 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,6 +33,10 @@ ENV REDIRECT_MODE="none"
 # Which HTTP code should we use for the above redirect
 ENV REDIRECT_CODE=302
 
+# And the protocol we should redirect to. Change this to "https" if you
+# serve via https (e.g. with a SSL-termination proxy infront of this)
+ENV REDIRECT_SCHEME="http"
+
 ADD etc/ /etc/
 ADD usr/ /usr/
 
diff --git a/etc/nginx/sites-available/redirect-apex-to-www.conf b/etc/nginx/sites-available/redirect-apex-to-www.conf
index 0d08eec..9e8875b 100644
--- a/etc/nginx/sites-available/redirect-apex-to-www.conf
+++ b/etc/nginx/sites-available/redirect-apex-to-www.conf
@@ -1,5 +1,5 @@
 server {
     listen 80;
     server_name ~^(?!www.)(?<domain>.+)$;
-    return {{REDIRECT_CODE}} https://www.$domain$request_uri;
+    return {{REDIRECT_CODE}} {{REDIRECT_SCHEME}}://www.$domain$request_uri;
 }
diff --git a/etc/nginx/sites-available/redirect-www-to-apex.conf b/etc/nginx/sites-available/redirect-www-to-apex.conf
index 059d7a0..b367d09 100644
--- a/etc/nginx/sites-available/redirect-www-to-apex.conf
+++ b/etc/nginx/sites-available/redirect-www-to-apex.conf
@@ -1,5 +1,5 @@
 server {
     listen 80;
     server_name ~^www.(?<domain>.+)$;
-    return {{REDIRECT_CODE}} https://$domain$request_uri;
+    return {{REDIRECT_CODE}} {{REDIRECT_SCHEME}}://$domain$request_uri;
 }
diff --git a/usr/bin/docker-start b/usr/bin/docker-start
index ab58ada..906430f 100755
--- a/usr/bin/docker-start
+++ b/usr/bin/docker-start
@@ -7,6 +7,7 @@ for file in /etc/nginx/*/*.conf; do
     sed -i \
         -e "s#{{REDIRECT_CODE}}#${REDIRECT_CODE}#g" \
         -e "s#{{DOCUMENT_ROOT}}#${DOCUMENT_ROOT}#g" \
+        -e "s#{{REDIRECT_SCHEME}}#${REDIRECT_SCHEME}#g" \
         "${file}"
 done