**Important Note:** Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup.
**Important Note:** Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup.
**Note:** If you want to use HTTPS, see [Using HTTPS](#using-https) for the additional steps.
**Note:** If you want to use HTTPS, see [Using HTTPS](#using-https) for the additional steps.
...
@@ -284,7 +304,7 @@ Check if GitLab and its environment are configured correctly:
...
@@ -284,7 +304,7 @@ Check if GitLab and its environment are configured correctly:
# or
# or
sudo /etc/init.d/gitlab restart
sudo /etc/init.d/gitlab restart
## 6. Nginx
## 7. Nginx
**Note:** Nginx is the officially supported web server for GitLab. If you cannot or do not want to use Nginx as your web server, have a look at the [GitLab recipes](https://gitlab.com/gitlab-org/gitlab-recipes/).
**Note:** Nginx is the officially supported web server for GitLab. If you cannot or do not want to use Nginx as your web server, have a look at the [GitLab recipes](https://gitlab.com/gitlab-org/gitlab-recipes/).
@@ -7,4 +7,25 @@ This document currently just serves as a place to keep track of updates that wil
...
@@ -7,4 +7,25 @@ This document currently just serves as a place to keep track of updates that wil
### Update config files
### Update config files
* HTTP setups: Make `/etc/nginx/sites-available/nginx` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-0-stable/lib/support/nginx/gitlab but with your settings.
* HTTP setups: Make `/etc/nginx/sites-available/nginx` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-0-stable/lib/support/nginx/gitlab but with your settings.
* HTTPS setups: Make `/etc/nginx/sites-available/nginx-ssl` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-0-stable/lib/support/nginx/gitlab-ssl but with your setting
* HTTPS setups: Make `/etc/nginx/sites-available/nginx-ssl` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-0-stable/lib/support/nginx/gitlab-ssl but with your setting