diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-11-04 11:28:36 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-11-04 11:28:36 +0000 |
| commit | 69bff037be19b0b426306959dfd9835021886ab8 (patch) | |
| tree | 4900abbf1c21eea3221bdaebe48bd03a3dfd03a0 | |
| parent | e2768498f02149c89c2f3908bc9ed76c76ca4560 (diff) | |
| parent | 624e3d91bca5f9b11b86d705dc18e7c9fcd9744e (diff) | |
| download | gitlab-ce-69bff037be19b0b426306959dfd9835021886ab8.tar.gz | |
Merge branch 'clarify-nginx-installation' into 'master'
Clarify NGINX config setup
These changes are to clarify that the paths may need to be changed in
the NGINX config file depending on where GitLab is installed.
See merge request !6834
| -rw-r--r-- | doc/install/installation.md | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md index 83090f46271..7e947e4b2ba 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -479,10 +479,14 @@ Copy the example site config: sudo cp lib/support/nginx/gitlab /etc/nginx/sites-available/gitlab sudo ln -s /etc/nginx/sites-available/gitlab /etc/nginx/sites-enabled/gitlab -Make sure to edit the config file to match your setup: +Make sure to edit the config file to match your setup. Also, ensure that you match your paths to GitLab, especially if installing for a user other than the 'git' user: # Change YOUR_SERVER_FQDN to the fully-qualified # domain name of your host serving GitLab. + # + # Remember to match your paths to GitLab, especially + # if installing for a user other than 'git'. + # # If using Ubuntu default nginx install: # either remove the default_server from the listen line # or else sudo rm -f /etc/nginx/sites-enabled/default |