Merge pull request #310 from ikarus23/master

do better redirection from http to https

Merge pull request #310 from ikarus23/master
do better redirection from http to https
82e75239 · Joshua Tauberer · 16422b40 · e330abd5 · 82e75239
Commit 82e75239 authored Jan 31, 2015 by Joshua Tauberer
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

nginx.conf conf/nginx.conf +4 -1

No files found.
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -7,7 +7,10 @@ server {

 	server_name $HOSTNAME;
 	root /tmp/invalid-path-nothing-here;
-	rewrite ^/(.*)$ https://$HOSTNAME/$1 permanent;
+	# Redirect using the 'return' directive and the built-in
+	# variable '$request_uri' to avoid any capturing, matching
+	# or evaluation of regular expressions.
+	return 301 https://$HOSTNAME$request_uri;
 }

 # The secure HTTPS server.