diff options
| author | Peter Kozak <spag@golwen.net> | 2013-02-27 06:05:06 -0500 |
|---|---|---|
| committer | Peter Kozak <spag@golwen.net> | 2013-02-27 06:05:06 -0500 |
| commit | 211f558a86ae30cdd5b392ab1376e1393f97e22c (patch) | |
| tree | f86ec6cedf081a1a57005eca1661e9bead34e4de /config | |
| parent | ed0117210837dd1d0d2dbf403799b70225caf0cd (diff) | |
| parent | 41e17e9f3e184975e8b429d3fb06d822c49068bf (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'config')
| -rw-r--r-- | config/backup.rb | 24 | ||||
| -rw-r--r-- | config/locales/views/restore_jobs/de.yml | 2 | ||||
| -rw-r--r-- | config/locales/views/restore_jobs/en.yml | 2 |
3 files changed, 21 insertions, 7 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 diff --git a/config/locales/views/restore_jobs/de.yml b/config/locales/views/restore_jobs/de.yml index 18ee349..3fdd72c 100644 --- a/config/locales/views/restore_jobs/de.yml +++ b/config/locales/views/restore_jobs/de.yml @@ -26,7 +26,7 @@ de: edit: 'Bearbeiten' view_all: 'Alle anzeigen' new: - page_title: 'Restore Auftrag neu anlegen' + page_title: 'Restore von einem Backup' actions: back_to_list: 'Zurück zur Übersicht' edit: diff --git a/config/locales/views/restore_jobs/en.yml b/config/locales/views/restore_jobs/en.yml index d75de95..636c335 100644 --- a/config/locales/views/restore_jobs/en.yml +++ b/config/locales/views/restore_jobs/en.yml @@ -26,7 +26,7 @@ en: edit: 'Edit' view_all: 'View All' new: - page_title: 'New Restorejob' + page_title: 'Restore from a backup' actions: back_to_list: 'Back to Index' edit: |