summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-12-14 09:22:42 -0800
committerStan Hu <stanhu@gmail.com>2015-12-14 09:23:53 -0800
commitb9b35012de171fe03d0be2c3adac6f219bb6927a (patch)
treef2233a9a536396ab52ad893a90c6850643d8c8ac
parent5bca9ec7508414ccba03f29ddca149ea93e62f45 (diff)
downloadgitlab-ce-b9b35012de171fe03d0be2c3adac6f219bb6927a.tar.gz
Update gitlab-workhorse and remove mention of gitlab-git-http-server
[ci skip]
-rw-r--r--doc/update/8.2-to-8.3.md23
1 files changed, 5 insertions, 18 deletions
diff --git a/doc/update/8.2-to-8.3.md b/doc/update/8.2-to-8.3.md
index 563754ff4f6..f1000ef4650 100644
--- a/doc/update/8.2-to-8.3.md
+++ b/doc/update/8.2-to-8.3.md
@@ -67,36 +67,23 @@ sudo -u git -H git checkout 8-3-stable-ee
```bash
cd /home/git/gitlab-shell
-sudo -u git -H git fetch
+sudo -u git -H git fetch --all
sudo -u git -H git checkout v2.6.8
```
-### 5. Replace gitlab-git-http-server with gitlab-workhorse
+### 5. Update gitlab-workhorse
Install and compile gitlab-workhorse. This requires [Go
1.5](https://golang.org/dl) which should already be on your system
from GitLab 8.1.
```bash
-cd /home/git
-sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-workhorse.git
-cd gitlab-workhorse
-sudo -u git -H git checkout 0.4.2
+cd /home/git/gitlab-workhorse
+sudo -u git -H git fetch --all
+sudo -u git -H git checkout 0.4.3
sudo -u git -H make
```
-Update the GitLab init script and 'default' file.
-
-```
-cd /home/git/gitlab
-sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
-test -e /etc/default/gitlab && \
- sudo sed -i.pre-8.2 's/^\([^=]*\)gitlab_git_http_server/\1gitlab_workhorse/' /etc/default/gitlab
-```
-
-Make sure that you also update your **NGINX configuration** to use
-the new gitlab-workhorse.socket file.
-
### 6. Install libs, migrations, etc.
```bash