diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-02-18 09:41:58 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-02-18 09:41:58 +0000 |
| commit | 8b918267c7477f7e1a36b4f3cc12c9e244204cb9 (patch) | |
| tree | ddd975c4ea73754a1b64f6f34b288184ba3f6361 | |
| parent | 52a8d1f3c6d8b2f1e9a4551a316c2390786c1650 (diff) | |
| parent | 19a3d42cb3262a135451e0a557366d4477ac81fc (diff) | |
| download | gitlab-ce-8b918267c7477f7e1a36b4f3cc12c9e244204cb9.tar.gz | |
Merge branch 're-add-missing-part-in-update-doc' into 'master'
Re-add section about NGINX config and init script updates in 8.4->8.5 update doc
These sections were removed by !2766 but:
- even if the NGINX config wasn't modified, it might
be in future updates so it's better to always have
it instead of having to remember to add it depending
on the changes
- the init script update section must be there since
it's a safe command line that should be run on every update
This fixes https://github.com/gitlabhq/gitlabhq/issues/10031.
/cc @rspeicher @yorickpeterse
See merge request !2815
| -rw-r--r-- | doc/update/8.4-to-8.5.md | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/doc/update/8.4-to-8.5.md b/doc/update/8.4-to-8.5.md index 42b26439848..408a17ac348 100644 --- a/doc/update/8.4-to-8.5.md +++ b/doc/update/8.4-to-8.5.md @@ -82,6 +82,32 @@ There are new configuration options available for [`gitlab.yml`](config/gitlab.y git diff origin/8-4-stable:config/gitlab.yml.example origin/8-5-stable:config/gitlab.yml.example ``` +#### Nginx configuration + +Ensure you're still up-to-date with the latest NGINX configuration changes: + +```sh +# For HTTPS configurations +git diff origin/8-4-stable:lib/support/nginx/gitlab-ssl origin/8-5-stable:lib/support/nginx/gitlab-ssl + +# For HTTP configurations +git diff origin/8-4-stable:lib/support/nginx/gitlab origin/8-5-stable:lib/support/nginx/gitlab +``` + +If you are using Apache instead of NGINX please see the updated [Apache templates]. +Also note that because Apache does not support upstreams behind Unix sockets you +will need to let gitlab-workhorse listen on a TCP port. You can do this +via [/etc/default/gitlab]. + +[Apache templates]: https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/web-server/apache +[/etc/default/gitlab]: https://gitlab.com/gitlab-org/gitlab-ce/blob/8-5-stable/lib/support/init.d/gitlab.default.example#L37 + +#### Init script + +Ensure you're still up-to-date with the latest init script changes: + + sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab + ### 8. Start application sudo service gitlab start |