summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-12-07 05:10:34 -0800
committerStan Hu <stanhu@gmail.com>2015-12-07 05:10:34 -0800
commite88fd58671f5407d80fafe1070d48b750b9f2e50 (patch)
treea3ea64f8808dbe9be83240bbefb8efa4bd63b6b9
parenta468bf346af9f86b4a9e5d3ba027e0debad948cc (diff)
parentb89943624822d453e745329cf51d0ca54bb4a434 (diff)
downloadgitlab-ce-e88fd58671f5407d80fafe1070d48b750b9f2e50.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r--lib/support/nginx/gitlab-ssl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/support/nginx/gitlab-ssl b/lib/support/nginx/gitlab-ssl
index 016f7a536fb..79fe1474821 100644
--- a/lib/support/nginx/gitlab-ssl
+++ b/lib/support/nginx/gitlab-ssl
@@ -56,7 +56,7 @@ server {
listen [::]:80 ipv6only=on default_server;
server_name YOUR_SERVER_FQDN; ## Replace this with something like gitlab.example.com
server_tokens off; ## Don't show the nginx version number, a security best practice
- return 301 https://$server_name$request_uri;
+ return 301 https://$http_host$request_uri;
access_log /var/log/nginx/gitlab_access.log;
error_log /var/log/nginx/gitlab_error.log;
}