summaryrefslogtreecommitdiff
path: root/doc/raketasks
diff options
context:
space:
mode:
authorJob van der Voort <jobvandervoort@gmail.com>2014-09-28 22:56:47 +0200
committerJob van der Voort <jobvandervoort@gmail.com>2014-09-28 22:56:47 +0200
commit05b3202855216d82bee5b0d098e1d8f2db45c63c (patch)
tree8b3890f74403f20c4981335589311467c2adaf6f /doc/raketasks
parent477214cdc6b696a083ece7735801116f2c8bbc26 (diff)
downloadgitlab-ce-05b3202855216d82bee5b0d098e1d8f2db45c63c.tar.gz
use omnibus package to refer to omnibus gitlab at all times to avoid confusion
Diffstat (limited to 'doc/raketasks')
-rw-r--r--doc/raketasks/backup_restore.md11
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index 4db08b1ba20..d9c5d5cb7e4 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