From e230551940b31f7779a16975f2b3e941815d2e03 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 10 Apr 2013 15:41:47 +0300
Subject: [PATCH] backup/restore uploads
---
CHANGELOG | 2 ++
lib/backup/uploads.rb | 25 +++++++++++++++++++++++++
lib/tasks/gitlab/backup.rake | 22 +++++++++++++++++++---
3 files changed, 46 insertions(+), 3 deletions(-)
create mode 100644 lib/backup/uploads.rb
diff --git a/CHANGELOG b/CHANGELOG
index afde794490b..d4deb97099e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,8 @@ v 5.1.0
- Backup/Restore refactored. Backup dump project wiki too now
- Restyled Issues list. Show milestone version in issue row
- Restyled Merge Request list
+ - Backup now dump/restore uploads
+ - Improved perfomance of dashboard
v 5.0.0
- Replaced gitolite with gitlab-shell
diff --git a/lib/backup/uploads.rb b/lib/backup/uploads.rb
new file mode 100644
index 00000000000..4a38af02522
--- /dev/null
+++ b/lib/backup/uploads.rb
@@ -0,0 +1,25 @@
+module Backup
+ class Uploads
+ attr_reader :app_uploads_dir, :backup_uploads_dir, :backup_dir
+
+ def initialize
+ @app_uploads_dir = Rails.root.join('public', 'uploads')
+ @backup_dir = Gitlab.config.backup.path
+ @backup_uploads_dir = File.join(Gitlab.config.backup.path, 'uploads')
+ end
+
+ # Copy uploads from public/uploads to backup/uploads
+ def dump
+ FileUtils.mkdir_p(backup_uploads_dir)
+ FileUtils.cp_r(app_uploads_dir, backup_dir)
+ end
+
+ def restore
+ if File.exists?(app_uploads_dir)
+ FileUtils.mv(app_uploads_dir, Rails.root.join('public', "uploads.#{Time.now.to_i}"))
+ end
+
+ FileUtils.cp_r(backup_uploads_dir, app_uploads_dir)
+ end
+ end
+end
diff --git a/lib/tasks/gitlab/backup.rake b/lib/tasks/gitlab/backup.rake
index 1f863424382..ad6ba43049c 100644
--- a/lib/tasks/gitlab/backup.rake
+++ b/lib/tasks/gitlab/backup.rake
@@ -9,6 +9,7 @@ namespace :gitlab do
Rake::Task["gitlab:backup:db:create"].invoke
Rake::Task["gitlab:backup:repo:create"].invoke
+ Rake::Task["gitlab:backup:uploads:create"].invoke
Dir.chdir(Gitlab.config.backup.path)
@@ -25,7 +26,7 @@ namespace :gitlab do
# create archive
print "Creating backup archive: #{Time.now.to_i}_gitlab_backup.tar ... "
- if Kernel.system("tar -cf #{Time.now.to_i}_gitlab_backup.tar repositories/ db/ backup_information.yml")
+ if Kernel.system("tar -cf #{Time.now.to_i}_gitlab_backup.tar repositories/ db/ uploads/ backup_information.yml")
puts "done".green
else
puts "failed".red
@@ -33,7 +34,7 @@ namespace :gitlab do
# cleanup: remove tmp files
print "Deleting tmp directories ... "
- if Kernel.system("rm -rf repositories/ db/ backup_information.yml")
+ if Kernel.system("rm -rf repositories/ db/ uploads/ backup_information.yml")
puts "done".green
else
puts "failed".red
@@ -99,10 +100,11 @@ namespace :gitlab do
Rake::Task["gitlab:backup:db:restore"].invoke
Rake::Task["gitlab:backup:repo:restore"].invoke
+ Rake::Task["gitlab:backup:uploads:restore"].invoke
# cleanup: remove tmp files
print "Deleting tmp directories ... "
- if Kernel.system("rm -rf repositories/ db/ backup_information.yml")
+ if Kernel.system("rm -rf repositories/ db/ uploads/ backup_information.yml")
puts "done".green
else
puts "failed".red
@@ -136,5 +138,19 @@ namespace :gitlab do
puts "done".green
end
end
+
+ namespace :uploads do
+ task :create => :environment do
+ puts "Dumping uploads ... ".blue
+ Backup::Uploads.new.dump
+ puts "done".green
+ end
+
+ task :restore => :environment do
+ puts "Restoring uploads ... ".blue
+ Backup::Uploads.new.restore
+ puts "done".green
+ end
+ end
end # namespace end: backup
end # namespace end: gitlab
--
GitLab