summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2015-09-22 13:52:53 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2015-09-22 13:52:53 +0200
commit29bb3b52156b41cca9ef6f6f729d66410f47f8ec (patch)
tree7577fa44c8dac97cc606522bb6ee0ac9c77afdee
parent23fa5d7d9e0ccb3663f4c714efa6c48593dbd449 (diff)
downloadgitlab-ce-29bb3b52156b41cca9ef6f6f729d66410f47f8ec.tar.gz
More explanation about moving DB secrets
-rw-r--r--doc/migrate_ci_to_ce/README.md6
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/migrate_ci_to_ce/README.md b/doc/migrate_ci_to_ce/README.md
index ab69f0fde7e..1cf23649f6f 100644
--- a/doc/migrate_ci_to_ce/README.md
+++ b/doc/migrate_ci_to_ce/README.md
@@ -116,7 +116,11 @@ sudo -u gitlab_ci -H bundle exec whenever --clear-crontab
### Moving data
-- (1) Move the database encryption key from your CI server to your GitLab server.
+- (1) Move the database encryption key from your CI server to your GitLab
+ server. The command below will show you what you need to copy-paste to your
+GitLab server. On Omnibus GitLab servers you will have to add a line to
+`/etc/gitlab/gitlab.rb`. On GitLab servers installed from source you will have
+to replace the contents of `/home/git/gitlab/config/secrets.yml`.
```
# CI server