summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2015-11-10 01:52:53 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2015-11-10 01:52:53 +0000
commit2ee3f8381bd498cae52cbc0fbeb656ceae5cde9e (patch)
treecbbd63c9578b5c92c4114a6450de4dc51e52e243
parent264dc3f7dd15f2abb6ec90fe72ed88f4cdda6f58 (diff)
parentbdb45360e76a272c275690cb11227a737c56e934 (diff)
downloadgitlab-ce-2ee3f8381bd498cae52cbc0fbeb656ceae5cde9e.tar.gz
Merge branch 'master' into 'master'
Change documentation of converting a MySQL-Database to a Postgres one The instructions were missleading. See -> https://gitlab.com/gitlab-org/gitlab-ce/issues/2904 closes #2904 See merge request !1549
-rw-r--r--doc/update/mysql_to_postgresql.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/update/mysql_to_postgresql.md b/doc/update/mysql_to_postgresql.md
index a596ea38456..a7de5648c0e 100644
--- a/doc/update/mysql_to_postgresql.md
+++ b/doc/update/mysql_to_postgresql.md
@@ -60,6 +60,9 @@ sudo -u git -H python mysql-postgresql-converter/db_converter.py gitlabhq_produc
sudo -u git -H ed -s db/database.sql < mysql-postgresql-converter/move_drop_indexes.ed
# Compress database backup
+# Warning: If you have Gitlab 7.12.0 or older skip this step and import the database.sql directly into the backup with:
+# sudo -u git -H tar rf TIMESTAMP_gitlab_backup.tar db/database.sql
+# The compressed databasedump is not supported at 7.12.0 and older.
sudo -u git -H gzip db/database.sql
# Replace the MySQL dump in TIMESTAMP_gitlab_backup.tar.
@@ -71,4 +74,5 @@ sudo -u git -H tar rf TIMESTAMP_gitlab_backup.tar db/database.sql.gz
# Done! TIMESTAMP_gitlab_backup.tar can now be restored into a Postgres GitLab
# installation.
+# See https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/raketasks/backup_restore.md for more information about backups.
```