Commit 0e8e9e5d authored by Sytse Sijbrandij's avatar Sytse Sijbrandij

Merge branch 'omnibus-words' into 'master'

Omnibus words

As discussed:

We want to standarize the words 'omnibus package' to avoid (apparent) confusion regarding the installation and setup methods.

See merge request !1126
parents 376e004c 8b17bdaa
......@@ -10,10 +10,10 @@ The filename will be `[TIMESTAMP]_gitlab_backup.tar`. This timestamp can be used
You can only restore a backup to exactly the same version of GitLab that you created it on, for example 7.2.1.
```
# omnibus-gitlab
# use this command if you've installed GitLab with the Omnibus package
sudo gitlab-rake gitlab:backup:create
# installation from source or cookbook
# if you've installed GitLab from source or using the cookbook
bundle exec rake gitlab:backup:create RAILS_ENV=production
```
......@@ -49,7 +49,7 @@ Deleting old backups... [SKIPPING]
## Storing configuration files
Please be informed that a backup does not store your configuration files.
If you use Omnibus-GitLab please see the [instructions in the readme to backup your configuration](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md#backup-and-restore-omnibus-gitlab-configuration).
If you use an Omnibus package please see the [instructions in the readme to backup your configuration](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md#backup-and-restore-omnibus-gitlab-configuration).
If you have a cookbook installation there should be a copy of your configuration in Chef.
If you have a manual installation please consider backing up your gitlab.yml file and any SSL keys and certificates.
......@@ -58,7 +58,7 @@ If you have a manual installation please consider backing up your gitlab.yml fil
You can only restore a backup to exactly the same version of GitLab that you created it on, for example 7.2.1.
```
# omnibus-gitlab
# Omnibus package installation
sudo gitlab-rake gitlab:backup:restore
# installation from source or cookbook
......@@ -104,8 +104,9 @@ Deleting tmp directories...[DONE]
## Configure cron to make daily backups
For omnibus-gitlab, see https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md#scheduling-a-backup .
For Omnibus package installations, see https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md#scheduling-a-backup .
For installation from source or cookbook:
```
cd /home/git/gitlab
sudo -u git -H editor config/gitlab.yml # Enable keep_time in the backup section to automatically delete old backups
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment