diff options
author | Ben Bodenmiller <bbodenmiller@hotmail.com> | 2014-09-07 15:31:13 -0700 |
---|---|---|
committer | Ben Bodenmiller <bbodenmiller@hotmail.com> | 2014-09-07 15:31:13 -0700 |
commit | 5d5d4ef91a31d39f15662a6a6bd8a314d860e608 (patch) | |
tree | 7a4e7f7f4659f9c15b14df6f7a711b8fb137c8a4 /doc/update | |
parent | f42a1ded99920998a9b63b309adc227485428d2c (diff) | |
download | gitlab-ce-5d5d4ef91a31d39f15662a6a6bd8a314d860e608.tar.gz |
simplify HTTPS setup details
also adds comment about updating nginx files during upgrades
Diffstat (limited to 'doc/update')
-rw-r--r-- | doc/update/6.0-to-7.2.md | 3 | ||||
-rw-r--r-- | doc/update/6.9-to-7.0.md | 3 | ||||
-rw-r--r-- | doc/update/7.1-to-7.2.md | 3 | ||||
-rw-r--r-- | doc/update/7.2-to-7.3.md | 10 |
4 files changed, 18 insertions, 1 deletions
diff --git a/doc/update/6.0-to-7.2.md b/doc/update/6.0-to-7.2.md index 770519a46e0..8dfcbcdd056 100644 --- a/doc/update/6.0-to-7.2.md +++ b/doc/update/6.0-to-7.2.md @@ -135,7 +135,8 @@ git diff 6-0-stable:config/gitlab.yml.example 7-2-stable:config/gitlab.yml.examp * Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-2-stable/config/gitlab.yml.example but with your settings. * Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-2-stable/config/unicorn.rb.example but with your settings. * Make `/home/git/gitlab-shell/config.yml` the same as https://gitlab.com/gitlab-org/gitlab-shell/blob/v1.9.7/config.yml.example but with your settings. -* Make `/etc/nginx/sites-available/nginx` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-2-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-2-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-2-stable/lib/support/nginx/gitlab-ssl but with your settings. * Copy rack attack middleware config ```bash 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 diff --git a/doc/update/7.1-to-7.2.md b/doc/update/7.1-to-7.2.md index b06f62aeb03..ff5574114a8 100644 --- a/doc/update/7.1-to-7.2.md +++ b/doc/update/7.1-to-7.2.md @@ -89,6 +89,9 @@ There are new configuration options available for gitlab.yml. View them with the git diff 7-1-stable:config/gitlab.yml.example 7-2-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 + Update rack attack middleware config ``` diff --git a/doc/update/7.2-to-7.3.md b/doc/update/7.2-to-7.3.md new file mode 100644 index 00000000000..7cc8f8e2ede --- /dev/null +++ b/doc/update/7.2-to-7.3.md @@ -0,0 +1,10 @@ +# From 7.2 to 7.3 + +# GitLab 7.3 has not been released yet! + +This document currently just serves as a place to keep track of updates that will be needed for the 7.3 update. + +### 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. +* 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
\ No newline at end of file |