From a6e490766d0cdaf94deca43949314932aec3fe9f Mon Sep 17 00:00:00 2001
From: Manuel de Brito Fontes <aledbf@gmail.com>
Date: Wed, 24 Jan 2018 09:25:49 -0300
Subject: [PATCH] Rollback #1854

---
 rootfs/etc/nginx/template/nginx.tmpl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl
index c9f1323dc2c0..b26666aab760 100644
--- a/rootfs/etc/nginx/template/nginx.tmpl
+++ b/rootfs/etc/nginx/template/nginx.tmpl
@@ -203,7 +203,8 @@ http {
     map "$scheme:$pass_access_scheme" $redirect_to_https {
         default          0;
         "http:http"      1;
-        "http:https"     1;
+        # this breaks support for ELB in L7
+        # "http:https"     1;
     }
 
     map $http_x_forwarded_port $pass_server_port {
@@ -241,6 +242,8 @@ http {
     server_name_in_redirect off;
     port_in_redirect        off;
 
+    rewrite_log             on;
+    
     ssl_protocols {{ $cfg.SSLProtocols }};
 
     # turn on session caching to drastically improve performance