Merge branch 'different_backup_path_for_ci' into 'master'

Use separate dir for ci_backups.

Fixes #618

See merge request !382

README.md

@@ -530,6 +530,8 @@ sudo gitlab-ci-rake backup:create
 This will store a tar file in `/var/opt/gitlab/backups`. The filename will look like
 `1393513186_gitlab_backup.tar`, where 1393513186 is a timestamp.
+Similarly for CI, this will store a tar file in `/var/opt/gitlab/ci-backups`.
+
 If you want to store your GitLab backups in a different directory, add the
 following setting to `/etc/gitlab/gitlab.rb` and run `sudo gitlab-ctl
 reconfigure`:

files/gitlab-config-template/gitlab.rb.template

@@ -435,7 +435,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 ## For setting up backups
 ## see https://gitlab.com/gitlab-org/omnibus-gitlab/blob/629def0a7a26e7c2326566f0758d4a27857b52a3/README.md#backups
-# gitlab_ci['backup_path'] = "/var/opt/gitlab/backups"
+# gitlab_ci['backup_path'] = "/var/opt/gitlab/ci-backups"
 # gitlab_ci['backup_keep_time'] = 604800
 # gitlab_ci['backup_upload_connection'] = {
 #   'provider' => 'AWS',

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -411,7 +411,7 @@ default['gitlab']['gitlab-ci']['gravatar_plain_url'] = nil
 default['gitlab']['gitlab-ci']['gravatar_ssl_url'] = nil
 # application.yml, backup section
-default['gitlab']['gitlab-ci']['backup_path'] = "/var/opt/gitlab/backups"
+default['gitlab']['gitlab-ci']['backup_path'] = "/var/opt/gitlab/ci-backups"
 default['gitlab']['gitlab-ci']['backup_keep_time'] = nil
 default['gitlab']['gitlab-ci']['backup_upload_connection'] = nil
 default['gitlab']['gitlab-ci']['backup_upload_remote_directory'] = nil