diff options
author | Marcia Ramos <virtua.creative@gmail.com> | 2018-10-10 09:37:00 +0000 |
---|---|---|
committer | Marcia Ramos <virtua.creative@gmail.com> | 2018-10-10 09:37:00 +0000 |
commit | a68cda05b9c018327e9c9b92689e83670195ece2 (patch) | |
tree | ef970fac5bc8a6a6d7f5befb7bec853a601e735d /doc/administration | |
parent | a01a13407cec131d89fd5a886411363bfef72686 (diff) | |
parent | eb45fdb95fd820aa808b5576c678804a291344ef (diff) | |
download | gitlab-ce-a68cda05b9c018327e9c9b92689e83670195ece2.tar.gz |
Merge branch 'docs-update-nfs-ha-git_data_dirs' into 'master'
Update the HA NFS docs
See merge request gitlab-org/gitlab-ce!22239
Diffstat (limited to 'doc/administration')
-rw-r--r-- | doc/administration/high_availability/nfs.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/administration/high_availability/nfs.md b/doc/administration/high_availability/nfs.md index 95e2caf0cad..ebc4c1c1c2d 100644 --- a/doc/administration/high_availability/nfs.md +++ b/doc/administration/high_availability/nfs.md @@ -87,7 +87,7 @@ Mount `/gitlab-nfs` then use the following Omnibus configuration to move each data location to a subdirectory: ```ruby -git_data_dirs({"default" => "/gitlab-nfs/gitlab-data/git-data"}) +git_data_dirs({"default" => { "path" => "/gitlab-nfs/gitlab-data/git-data"} }) user['home'] = '/gitlab-nfs/gitlab-data/home' gitlab_rails['uploads_directory'] = '/gitlab-nfs/gitlab-data/uploads' gitlab_rails['shared_path'] = '/gitlab-nfs/gitlab-data/shared' @@ -133,7 +133,7 @@ following are the 5 locations need to be shared: | Location | Description | Default configuration | | -------- | ----------- | --------------------- | -| `/var/opt/gitlab/git-data` | Git repository data. This will account for a large portion of your data | `git_data_dirs({"default" => "/var/opt/gitlab/git-data"})` +| `/var/opt/gitlab/git-data` | Git repository data. This will account for a large portion of your data | `git_data_dirs({"default" => { "path" => "/var/opt/gitlab/git-data"} })` | `/var/opt/gitlab/.ssh` | SSH `authorized_keys` file and keys used to import repositories from some other Git services | `user['home'] = '/var/opt/gitlab/'` | `/var/opt/gitlab/gitlab-rails/uploads` | User uploaded attachments | `gitlab_rails['uploads_directory'] = '/var/opt/gitlab/gitlab-rails/uploads'` | `/var/opt/gitlab/gitlab-rails/shared` | Build artifacts, GitLab Pages, LFS objects, temp files, etc. If you're using LFS this may also account for a large portion of your data | `gitlab_rails['shared_path'] = '/var/opt/gitlab/gitlab-rails/shared'` |