summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-04 14:49:08 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-04 14:49:08 -0800
commit72db0c4dc0a3810503ae7b0517d3aa925d88dc1c (patch)
tree4f63f202df7aec473c16d7792f2b3d3c05fa7d5a /lib
parent60b80541cd866229a76a51ccca73d4d0ebef31be (diff)
parent434c4a2b5d0a6b89d050f3b7b4e4e4442ffde733 (diff)
downloadgitlab-ce-72db0c4dc0a3810503ae7b0517d3aa925d88dc1c.tar.gz
Merge pull request #8395 from sbeh/master
Socket [::]:123 on Linux listens on IPv4 and IPv6
Diffstat (limited to 'lib')
-rw-r--r--lib/support/nginx/gitlab-ssl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/support/nginx/gitlab-ssl b/lib/support/nginx/gitlab-ssl
index 4e53d5e8b50..19af010a9f7 100644
--- a/lib/support/nginx/gitlab-ssl
+++ b/lib/support/nginx/gitlab-ssl
@@ -39,7 +39,7 @@ upstream gitlab {
## Redirects all HTTP traffic to the HTTPS host
server {
listen 0.0.0.0:80;
- listen [::]:80 default_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;
@@ -51,7 +51,7 @@ server {
## HTTPS host
server {
listen 0.0.0.0:443 ssl;
- listen [::]:443 ssl default_server;
+ listen [::]:443 ipv6only=on ssl 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
root /home/git/gitlab/public;