summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2015-12-07 14:03:33 +0100
committerJacob Vosmaer <contact@jacobvosmaer.nl>2015-12-07 14:03:33 +0100
commitb89943624822d453e745329cf51d0ca54bb4a434 (patch)
treefc1a06a85d613943bda918d53f39887c790990fa
parent234f4bf20fb338f2164976fd39203fbc671afd29 (diff)
parent1c4213acd5dde6ce44a70b79dd766e9e7f8b59b4 (diff)
downloadgitlab-ce-b89943624822d453e745329cf51d0ca54bb4a434.tar.gz
Merge pull request #9892 from stetskevych/fix_nginx_ssl_config
Fix gitlab-ssl nginx config to work when multiple server_names are served over https
-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;
}