diff --git a/lib/backup_restore/backup_restore.rb b/lib/backup_restore/backup_restore.rb index af4670fb125..0b50e094fbd 100644 --- a/lib/backup_restore/backup_restore.rb +++ b/lib/backup_restore/backup_restore.rb @@ -7,7 +7,8 @@ module BackupRestore class OperationRunningError < RuntimeError; end VERSION_PREFIX = "v".freeze - DUMP_FILE = "dump.sql" + DUMP_FILE = "dump.sql.gz".freeze + OLD_DUMP_FILE = "dump.sql".freeze METADATA_FILE = "meta.json" LOGS_CHANNEL = "/admin/backups/logs" diff --git a/lib/backup_restore/backuper.rb b/lib/backup_restore/backuper.rb index 39800d4bea8..0bb87b8cf54 100644 --- a/lib/backup_restore/backuper.rb +++ b/lib/backup_restore/backuper.rb @@ -81,7 +81,7 @@ module BackupRestore @current_db = RailsMultisite::ConnectionManagement.current_db @timestamp = Time.now.strftime("%Y-%m-%d-%H%M%S") @tmp_directory = File.join(Rails.root, "tmp", "backups", @current_db, @timestamp) - @dump_filename = "#{File.join(@tmp_directory, BackupRestore::DUMP_FILE)}.gz" + @dump_filename = File.join(@tmp_directory, BackupRestore::DUMP_FILE) @archive_directory = File.join(Rails.root, "public", "backups", @current_db) @archive_basename = File.join(@archive_directory, "#{SiteSetting.title.parameterize}-#{@timestamp}-#{BackupRestore::VERSION_PREFIX}#{BackupRestore.current_version}") diff --git a/lib/backup_restore/restorer.rb b/lib/backup_restore/restorer.rb index 126c3dbdebe..4a016cbec1b 100644 --- a/lib/backup_restore/restorer.rb +++ b/lib/backup_restore/restorer.rb @@ -116,9 +116,9 @@ module BackupRestore @dump_filename = if @is_archive if system('tar', '--list', '--file', @source_filename, BackupRestore::OLD_DUMP_FILE) - File.join(@tmp_directory, BackupRestore::DUMP_FILE) + File.join(@tmp_directory, BackupRestore::OLD_DUMP_FILE) else - File.join(@tmp_directory, "#{BackupRestore::DUMP_FILE}.gz") + File.join(@tmp_directory, BackupRestore::DUMP_FILE) end else File.join(@tmp_directory, @filename)