summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVinnie Okada <vokada@mrvinn.com>2015-03-28 08:38:48 -0600
committerVinnie Okada <vokada@mrvinn.com>2015-03-28 08:38:48 -0600
commit0f78d92e4cfaf5c6674701fdf54a7188686cb8eb (patch)
tree0b312ffd742e172acf08b7509cb87536a60d4e80
parent6664da431aaa9f9a521323004420bcf700af4306 (diff)
downloadgitlab-ce-0f78d92e4cfaf5c6674701fdf54a7188686cb8eb.tar.gz
Don't use chmod_R for backup tars
When creating backup tar files, only change permissions on the `db`, `uploads`, and `repositories` directories, not their contents.
-rw-r--r--lib/backup/manager.rb2
-rw-r--r--spec/tasks/gitlab/backup_rake_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb
index afd05897509..d445150c55e 100644
--- a/lib/backup/manager.rb
+++ b/lib/backup/manager.rb
@@ -17,7 +17,7 @@ module Backup
file << s.to_yaml.gsub(/^---\n/,'')
end
- FileUtils.chmod_R(0700, %w{db uploads repositories})
+ FileUtils.chmod(0700, %w{db uploads repositories})
# create archive
$progress.print "Creating backup archive: #{tar_file} ... "
diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb
index 8a411b7720a..3d5d21c2a13 100644
--- a/spec/tasks/gitlab/backup_rake_spec.rb
+++ b/spec/tasks/gitlab/backup_rake_spec.rb
@@ -87,7 +87,7 @@ describe 'gitlab:app namespace rake task' do
expect(tar_contents).to match('db/')
expect(tar_contents).to match('uploads/')
expect(tar_contents).to match('repositories/')
- expect(tar_contents).not_to match(/^.{4,9}[rwx]/)
+ expect(tar_contents).not_to match(/^.{4,9}[rwx].*(db|uploads|repositories)\/$/)
end
it 'should delete temp directories' do