Keep old path: db/database.sql.gz

Documentation elsewhere refers to this internal path, let's keep
it.
This commit is contained in:
Jacob Vosmaer
2015-10-06 15:21:15 +02:00
parent 7b71727c56
commit e789644783
2 changed files with 4 additions and 3 deletions
+2 -1
View File
@@ -6,10 +6,11 @@ module Backup
def initialize
@config = YAML.load_file(File.join(Rails.root,'config','database.yml'))[Rails.env]
@db_file_name = File.join(Gitlab.config.backup.path, 'database.sql.gz')
@db_file_name = File.join(Gitlab.config.backup.path, 'db', 'database.sql.gz')
end
def dump
FileUtils.mkdir_p(File.dirname(db_file_name))
FileUtils.rm_f(db_file_name)
compress_rd, compress_wr = IO.pipe
compress_pid = spawn(*%W(gzip -1 -c), in: compress_rd, out: [db_file_name, 'w', 0600])
+2 -2
View File
@@ -150,11 +150,11 @@ module Backup
private
def backup_contents
folders_to_backup + ["database.sql.gz", "uploads.tar.gz", "builds.tar.gz", "backup_information.yml"]
folders_to_backup + ["uploads.tar.gz", "builds.tar.gz", "backup_information.yml"]
end
def folders_to_backup
folders = %w{repositories}
folders = %w{repositories db}
if ENV["SKIP"]
return folders.reject{ |folder| ENV["SKIP"].include?(folder) }