Merge pull request #1275 from qhartman/master

[nginx] Add support for simple redirector mode

nginx/config/nginx.conf

@@ -22,13 +22,21 @@ http {
     gzip_types text/plain text/css text/xml text/javascript application/x-javascript application/xml;
     gzip_disable "MSIE [1-6]\.";
 
+    {{#if cfg.redirector ~}}
+    server {
+        listen       {{cfg.http.listen.port}} default_server;
+        listen       [::]:{{cfg.http.listen.port}} default_server;
+        server_name  _;
+        return 301 https://$host$request_uri;
+    }
+    {{else}}
     server {
         listen       {{cfg.http.listen.port}};
         server_name  localhost;
 
         location / {
             root   {{pkg.svc_data_path}};
             index  index.html index.htm;
-        }
     }
+    {{/if ~}}
 }

nginx/default.toml

@@ -8,7 +8,10 @@
  # refer to: http://nginx.org/en/docs/http/ngx_http_core_module.html
 
 
+
 #### General Configuration
+# redirector: If set, bypass normal config and just redirect http to https
+# redirector = true
 # worker_processes: Number of NGINX processes. Default = 1
 worker_processes = 4