backup/restore uploads

diff --git a/CHANGELOG b/CHANGELOG
index afde794..d4deb97 100644 (file)
--- 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 (file)
index 0000000..4a38af0
--- /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 1f86342..ad6ba43 100644 (file)
--- 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