summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2014-09-22 14:50:06 +0200
committerMarin Jankovski <marin@gitlab.com>2014-09-22 14:50:06 +0200
commit457caaae49c9a228fb0711e8371dc520401e92e9 (patch)
treecf793a5945998b6329562563e9b44fe357920065
parent88d3da19f928002d9857162cd5e3fc0939317429 (diff)
downloadgitlab-ce-457caaae49c9a228fb0711e8371dc520401e92e9.tar.gz
Update manual installation guide for the correct shell version.
-rw-r--r--doc/install/installation.md4
-rw-r--r--doc/update/upgrader.md4
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md
index a0e39e42e7b..bdedd590e09 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -139,7 +139,7 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da
# Configure redis to use sockets
sudo cp /etc/redis/redis.conf /etc/redis/redis.conf.orig
-
+
# Disable Redis listening on TCP by setting 'port' to 0
sed 's/^port .*/port 0/' /etc/redis/redis.conf.orig | sudo tee /etc/redis/redis.conf
@@ -257,7 +257,7 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da
GitLab Shell is an SSH access and repository management software developed specially for GitLab.
# Run the installation task for gitlab-shell (replace `REDIS_URL` if needed):
- sudo -u git -H bundle exec rake gitlab:shell:install[v1.9.7] REDIS_URL=redis://localhost:6379 RAILS_ENV=production
+ sudo -u git -H bundle exec rake gitlab:shell:install[v2.0.0] REDIS_URL=unix:/var/run/redis/redis.sock RAILS_ENV=production
# By default, the gitlab-shell config is generated from your main GitLab config.
# You can review (and modify) the gitlab-shell config as follows:
diff --git a/doc/update/upgrader.md b/doc/update/upgrader.md
index e8379fcc318..9943e9205db 100644
--- a/doc/update/upgrader.md
+++ b/doc/update/upgrader.md
@@ -47,12 +47,12 @@ If all items are green, then congratulations upgrade is complete!
If the `gitlab:check` task reports an outdated version of `gitlab-shell` you should upgrade it.
-Upgrade it by running the commands below after replacing 1.9.4 with the correct version number:
+Upgrade it by running the commands below after replacing 2.0.0 with the correct version number:
```
cd /home/git/gitlab-shell
sudo -u git -H git fetch
-sudo -u git -H git checkout v1.9.4
+sudo -u git -H git checkout v2.0.0
```
## One line upgrade command