diff options
| author | Luke Ashe-Browne <xactly@gmail.com> | 2014-12-03 10:43:27 +0000 |
|---|---|---|
| committer | Luke Ashe-Browne <xactly@gmail.com> | 2014-12-03 10:43:27 +0000 |
| commit | 32c6fe5385e9211b17f7dc71e36d07543a6066fa (patch) | |
| tree | 82d2bac22a02222e14c6a2b85d7c24ecff4a47f1 | |
| parent | a70e7d61acfa6eb41acf049ece0ca39ac70de09a (diff) | |
| download | gitlab-ce-32c6fe5385e9211b17f7dc71e36d07543a6066fa.tar.gz | |
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.
| -rw-r--r-- | doc/install/installation.md | 3 | ||||
| -rw-r--r-- | lib/support/nginx/gitlab | 6 | ||||
| -rw-r--r-- | lib/support/nginx/gitlab-ssl | 4 |
3 files changed, 12 insertions, 1 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md index 263259bc2f9..d107ea15946 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -353,6 +353,9 @@ Make sure to edit the config file to match your setup: # Change YOUR_SERVER_FQDN to the fully-qualified # domain name of your host serving GitLab. + # If using Ubuntu default nginx install: + # either remove the default_server from the listen line + # or else rm -f /etc/sites-enabled/default sudo editor /etc/nginx/sites-available/gitlab **Note:** If you want to use HTTPS, replace the `gitlab` Nginx config with `gitlab-ssl`. See [Using HTTPS](#using-https) for HTTPS configuration details. 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 |