summaryrefslogtreecommitdiff
path: root/doc/update/6.9-to-7.0.md
diff options
context:
space:
mode:
authorBen Bodenmiller <bbodenmiller@hotmail.com>2014-09-07 15:31:13 -0700
committerBen Bodenmiller <bbodenmiller@hotmail.com>2014-09-07 15:31:13 -0700
commit5d5d4ef91a31d39f15662a6a6bd8a314d860e608 (patch)
tree7a4e7f7f4659f9c15b14df6f7a711b8fb137c8a4 /doc/update/6.9-to-7.0.md
parentf42a1ded99920998a9b63b309adc227485428d2c (diff)
downloadgitlab-ce-5d5d4ef91a31d39f15662a6a6bd8a314d860e608.tar.gz
simplify HTTPS setup details
also adds comment about updating nginx files during upgrades
Diffstat (limited to 'doc/update/6.9-to-7.0.md')
-rw-r--r--doc/update/6.9-to-7.0.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/update/6.9-to-7.0.md b/doc/update/6.9-to-7.0.md
index bbb3b2617a7..1f3421a799b 100644
--- a/doc/update/6.9-to-7.0.md
+++ b/doc/update/6.9-to-7.0.md
@@ -105,6 +105,9 @@ There are new configuration options available for gitlab.yml. View them with the
git diff origin/6-9-stable:config/gitlab.yml.example origin/7-0-stable:config/gitlab.yml.example
```
+* 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
+
### 7. Start application
sudo service gitlab start