diff options
author | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-09 10:31:31 -0500 |
---|---|---|
committer | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-09 10:31:31 -0500 |
commit | f7b8ae3fe2adc95f18f779d737e60eac45a14223 (patch) | |
tree | e4a69fe0ea45085e2161729111f99ff94f5a3a03 /doc | |
parent | 6466739e2e61f790a9e1f09020dba710c4078a0f (diff) | |
download | gitlab-ce-f7b8ae3fe2adc95f18f779d737e60eac45a14223.tar.gz |
apply feedback
Diffstat (limited to 'doc')
-rw-r--r-- | doc/administration/geo/replication/object_storage.md | 38 | ||||
-rw-r--r-- | doc/gitlab-geo/object_storage.md | 1 | ||||
-rw-r--r-- | doc/workflow/lfs/lfs_administration.md | 2 |
3 files changed, 1 insertions, 40 deletions
diff --git a/doc/administration/geo/replication/object_storage.md b/doc/administration/geo/replication/object_storage.md deleted file mode 100644 index 36d9cf7af83..00000000000 --- a/doc/administration/geo/replication/object_storage.md +++ /dev/null @@ -1,38 +0,0 @@ -# Geo with Object storage - -Geo can be used in combination with Object Storage (AWS S3, or -other compatible object storage). - -## Configuration - -At this time it is required that if object storage is enabled on the -primary, it must also be enabled on the secondary. - -The secondary nodes can use the same storage bucket as the primary, or -they can use a replicated storage bucket. At this time GitLab does not -take care of content replication in object storage. - -For LFS, follow the documentation to -[set up LFS object storage](../../../workflow/lfs/lfs_administration.md#setting-up-s3-compatible-object-storage). - -For CI job artifacts, there is similar documentation to configure -[jobs artifact object storage](../../job_artifacts.md#using-object-storage) - -Complete these steps on all nodes, primary **and** secondary. - -## Replication - -When using Amazon S3, you can use -[CRR](https://docs.aws.amazon.com/AmazonS3/latest/dev/crr.html) to -have automatic replication between the bucket used by the primary and -the bucket used by the secondary. - -If you are using Google Cloud Storage, consider using -[Multi-Regional Storage](https://cloud.google.com/storage/docs/storage-classes#multi-regional). -Or you can use the [Storage Transfer Service](https://cloud.google.com/storage/transfer/), -although this only supports daily synchronization. - -For manual synchronization, or scheduled by `cron`, please have a look at: - -- [`s3cmd sync`](http://s3tools.org/s3cmd-sync) -- [`gsutil rsync`](https://cloud.google.com/storage/docs/gsutil/commands/rsync) diff --git a/doc/gitlab-geo/object_storage.md b/doc/gitlab-geo/object_storage.md deleted file mode 100644 index 272bc13c450..00000000000 --- a/doc/gitlab-geo/object_storage.md +++ /dev/null @@ -1 +0,0 @@ -This document was moved to [another location](../administration/geo/replication/object_storage.md). diff --git a/doc/workflow/lfs/lfs_administration.md b/doc/workflow/lfs/lfs_administration.md index fdf31a3bac7..a3c9c878fe5 100644 --- a/doc/workflow/lfs/lfs_administration.md +++ b/doc/workflow/lfs/lfs_administration.md @@ -47,7 +47,7 @@ In `config/gitlab.yml`: ## Setting up S3 compatible object storage > **Note:** [Introduced][ee-2760] in [GitLab Premium][eep] 10.0. -> Available in [GitLab CE][ce] 10.6 +> Available in [GitLab CE][ce] 10.7 It is possible to store LFS objects on remote object storage instead of on a local disk. |