From 32c6fe5385e9211b17f7dc71e36d07543a6066fa Mon Sep 17 00:00:00 2001 From: Luke Ashe-Browne Date: Wed, 3 Dec 2014 10:43:27 +0000 Subject: adding notes to gitlab nginx conf We want to make users aware that the nginx default config will conflict with the gitlab default_server conf file. --- lib/support/nginx/gitlab | 6 +++++- lib/support/nginx/gitlab-ssl | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'lib/support') diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab index c8b769ace8e..182d3aaaa26 100644 --- a/lib/support/nginx/gitlab +++ b/lib/support/nginx/gitlab @@ -34,7 +34,11 @@ upstream gitlab { ## Normal HTTP host server { - listen 0.0.0.0:80 default_server; + + listether remove "default_server" from the listen line below, + ## or delete the /etc/nginx/sites-enabled/default file. This will cause gitlab + ## to be served if you visit any address that your server responds to, eg. + ## the ip address of the server (http://x.x.x.x/)n 0.0.0.0:80 default_server; listen [::]:80 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 diff --git a/lib/support/nginx/gitlab-ssl b/lib/support/nginx/gitlab-ssl index 4e53d5e8b50..25b52ee17da 100644 --- a/lib/support/nginx/gitlab-ssl +++ b/lib/support/nginx/gitlab-ssl @@ -38,6 +38,10 @@ upstream gitlab { ## Redirects all HTTP traffic to the HTTPS host server { + ## Either remove "default_server" from the listen line below, + ## or delete the /etc/nginx/sites-enabled/default file. This will cause gitlab + ## to be served if you visit any address that your server responds to, eg. + ## the ip address of the server (http://x.x.x.x/) listen 0.0.0.0:80; listen [::]:80 default_server; server_name YOUR_SERVER_FQDN; ## Replace this with something like gitlab.example.com -- cgit v1.2.1 From e338e85d1bb88296d7008f65e9ee59550baaa73b Mon Sep 17 00:00:00 2001 From: Luke Ashe-Browne Date: Wed, 3 Dec 2014 13:35:27 +0000 Subject: fixed typo --- lib/support/nginx/gitlab | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/support') diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab index 182d3aaaa26..c25c269148f 100644 --- a/lib/support/nginx/gitlab +++ b/lib/support/nginx/gitlab @@ -34,11 +34,11 @@ upstream gitlab { ## Normal HTTP host server { - - listether remove "default_server" from the listen line below, + ## Either remove "default_server" from the listen line below, ## or delete the /etc/nginx/sites-enabled/default file. This will cause gitlab ## to be served if you visit any address that your server responds to, eg. ## the ip address of the server (http://x.x.x.x/)n 0.0.0.0:80 default_server; + listen 0.0.0.0:80 default_server; listen [::]:80 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 -- cgit v1.2.1