diff options
| author | Sytse Sijbrandij <sytse@gitlab.com> | 2014-09-29 10:58:38 +0000 |
|---|---|---|
| committer | Sytse Sijbrandij <sytse@gitlab.com> | 2014-09-29 10:58:38 +0000 |
| commit | 0e8e9e5d77478294288d34474e580916418ddd91 (patch) | |
| tree | 3f4cc668e39518764b02ab4d6928f3ade10e706e | |
| parent | 376e004c16510174dd29ab2953ebdbb28ce2e91b (diff) | |
| parent | 8b17bdaafc0fc675bc116a24f7e5ce8a593e38f7 (diff) | |
| download | gitlab-ce-0e8e9e5d77478294288d34474e580916418ddd91.tar.gz | |
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
| -rw-r--r-- | doc/raketasks/backup_restore.md | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md index 4db08b1ba20..beb2c33a67b 100644 --- a/doc/raketasks/backup_restore.md +++ b/doc/raketasks/backup_restore.md @@ -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 |