diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-01-08 12:59:19 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-01-08 12:59:19 -0600 |
| commit | 606b5094c15f36ebd9d697440446c48b54d40e6c (patch) | |
| tree | ddb7bf3dfa8d925c38307bca0ff8837cc9d3741f /lib/backup/files.rb | |
| parent | 7f7a18c0c37a11b1eba2ac5575087b7b85c3ec5f (diff) | |
| parent | 1d7b46062feb1d93dd3efaf6ba4d5d934068342c (diff) | |
| download | gitlab-ce-improve-table-pagination-spec.tar.gz | |
Merge branch 'master' into improve-table-pagination-specimprove-table-pagination-spec
Diffstat (limited to 'lib/backup/files.rb')
| -rw-r--r-- | lib/backup/files.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/backup/files.rb b/lib/backup/files.rb index 30a91647b77..287d591e88d 100644 --- a/lib/backup/files.rb +++ b/lib/backup/files.rb @@ -18,7 +18,7 @@ module Backup FileUtils.rm_f(backup_tarball) if ENV['STRATEGY'] == 'copy' - cmd = %W(cp -a #{app_files_dir} #{Gitlab.config.backup.path}) + cmd = %W(rsync -a --exclude=lost+found #{app_files_dir} #{Gitlab.config.backup.path}) output, status = Gitlab::Popen.popen(cmd) unless status.zero? @@ -26,10 +26,10 @@ module Backup abort 'Backup failed' end - run_pipeline!([%W(tar -C #{@backup_files_dir} -cf - .), %w(gzip -c -1)], out: [backup_tarball, 'w', 0600]) + run_pipeline!([%W(tar --exclude=lost+found -C #{@backup_files_dir} -cf - .), %w(gzip -c -1)], out: [backup_tarball, 'w', 0600]) FileUtils.rm_rf(@backup_files_dir) else - run_pipeline!([%W(tar -C #{app_files_dir} -cf - .), %w(gzip -c -1)], out: [backup_tarball, 'w', 0600]) + run_pipeline!([%W(tar --exclude=lost+found -C #{app_files_dir} -cf - .), %w(gzip -c -1)], out: [backup_tarball, 'w', 0600]) end end |