Download as
Browse Code »

Commit 27a1517bbc2e948cb4cdc7f74699579891138a12

Authored by dosire
1 parent 55ef505b
Exists in master and in 13 other branches 6-8-stable, 6-8-stable-ee, 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Adding limitations and fixing a typo.

Showing 1 changed file with 5 additions and 1 deletions   Show diff stats
@@ -2,6 +2,10 @@ @@ -2,6 +2,10 @@
2 2
3 ## Upgrading from a non-Omnibus installation to an Omnibus installation 3 ## Upgrading from a non-Omnibus installation to an Omnibus installation
4 4
  5 +Please be advised that you lose your settings in files such as gitlab.yml, unicorn.rb and smtp_settings.rb.
  6 +You will have to [configure those settings in /etc/gitlab/gitlab.rb](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md#configuration).
  7 +SMTP is not supported in omnibus-gitlab at this time.
  8 +
5 Do this by [creating a backup from the non-Omnibus install](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/raketasks/backup_restore.md#create-a-backup-of-the-gitlab-system) and [restoring this in the Omnibus installation](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md#restoring-an-application-backup). 9 Do this by [creating a backup from the non-Omnibus install](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/raketasks/backup_restore.md#create-a-backup-of-the-gitlab-system) and [restoring this in the Omnibus installation](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md#restoring-an-application-backup).
6 Please ensure you are using exactly equal versions of GitLab (for example 6.7.3) when you do this. 10 Please ensure you are using exactly equal versions of GitLab (for example 6.7.3) when you do this.
7 You might have to upgrade your non-Omnibus installation before creating the backup to archive this. 11 You might have to upgrade your non-Omnibus installation before creating the backup to archive this.
@@ -64,7 +68,7 @@ sudo gitlab-ctl start @@ -64,7 +68,7 @@ sudo gitlab-ctl start
64 68
65 Done! 69 Done!
66 70
67 -## sReverting to GitLab 6.6.x 71 +## Reverting to GitLab 6.6.x
68 72
69 First download a GitLab 6.6.x [CE](https://www.gitlab.com/downloads/archives/) or 73 First download a GitLab 6.6.x [CE](https://www.gitlab.com/downloads/archives/) or
70 [EE (subscribers only)](https://gitlab.com/subscribers/gitlab-ee/blob/master/doc/install/packages.md) 74 [EE (subscribers only)](https://gitlab.com/subscribers/gitlab-ee/blob/master/doc/install/packages.md)