summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-06-05 18:43:39 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-06-05 18:43:39 +0000
commit50bfbb497e15157848cef0e656b46638905e3007 (patch)
treecb3b4b171c633e04ce2282ddcca203d40beb454a
parent1804c82dc4b099912c384ce10d957b2dddb322b6 (diff)
parentae97e5d5fb685ee28584d9e13e7443c6b07b2b53 (diff)
downloadgitlab-ce-50bfbb497e15157848cef0e656b46638905e3007.tar.gz
Merge branch 'patch-66' into 'master'
disable Rugged when switching to Gitaly without NFS See merge request gitlab-org/gitlab-ce!29086
-rw-r--r--doc/administration/gitaly/index.md3
-rw-r--r--doc/administration/high_availability/nfs.md3
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/administration/gitaly/index.md b/doc/administration/gitaly/index.md
index dcf8d8715ca..53a85dfad6c 100644
--- a/doc/administration/gitaly/index.md
+++ b/doc/administration/gitaly/index.md
@@ -220,6 +220,9 @@ network, firewall, or name resolution problem preventing your GitLab
server from reaching the Gitaly server then all Gitaly requests will
fail.
+Additionally, you need to
+[disable Rugged if previously manually enabled](../high_availability/nfs.md#improving-nfs-performance-with-gitlab).
+
We assume that your Gitaly server can be reached at
`gitaly.internal:8075` from your GitLab server, and that Gitaly can read and
write to `/mnt/gitlab/default` and `/mnt/gitlab/storage1` respectively.
diff --git a/doc/administration/high_availability/nfs.md b/doc/administration/high_availability/nfs.md
index f6bbc8935b4..490c2699458 100644
--- a/doc/administration/high_availability/nfs.md
+++ b/doc/administration/high_availability/nfs.md
@@ -56,7 +56,8 @@ To do this, run the Rake task:
sudo gitlab-rake gitlab:features:enable_rugged
```
-If you need to undo this setting for some reason, run:
+If you need to undo this setting for some reason such as switching to [Gitaly without NFS](gitaly.md)
+(recommended), run:
```sh
sudo gitlab-rake gitlab:features:disable_rugged