Merge branch 'develop' of github.com:amooma/GS5 into develop

1 files changed, 19 insertions, 5 deletions

diff --git a/config/backup.rb b/config/backup.rb
index 1c79c04..b50f7a8 100644
--- a/config/backup.rb
+++ b/config/backup.rb
@@ -24,7 +24,7 @@ Backup::Model.new(:GS5, 'GS5 backup') do
     db.host               = "localhost"
     db.port               = 3306
     db.socket             = "/var/run/mysqld/mysqld.sock"
-    db.skip_tables        = ["backup_jobs", "restore_jobs"]
+    db.skip_tables        = ["backup_jobs", "restore_jobs", "fax_thumbnails"]
   end
 
   ##
@@ -32,7 +32,23 @@ Backup::Model.new(:GS5, 'GS5 backup') do
   #
   if File.exists?('/var/opt/gemeinschaft/fax')
     archive :faxes do |archive|
-      archive.add     '/var/opt/gemeinschaft/fax'
+      # Incoming faxes
+      #
+      Dir.glob("/var/opt/gemeinschaft/fax/in/**/*.pdf").each do |fax_file|
+        archive.add(fax_file)
+      end
+      Dir.glob("/var/opt/gemeinschaft/fax/in/**/*.tiff").each do |fax_file|
+        archive.add(fax_file)
+      end
+
+      # Outgoing faxes
+      #
+      Dir.glob("/var/opt/gemeinschaft/fax/out/**/*.pdf").each do |fax_file|
+        archive.add(fax_file)
+      end
+      Dir.glob("/var/opt/gemeinschaft/fax/out/**/*.tiff").each do |fax_file|
+        archive.add(fax_file)
+      end
     end
   end
 
@@ -56,6 +72,4 @@ Backup::Model.new(:GS5, 'GS5 backup') do
   # Gzip [Compressor]
   #
   compress_with Gzip
-
-end
-
+end
\ No newline at end of file