external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2024-11-22 02:17:26 +00:00
Code Issues Releases Wiki Activity

Merge pull request #410 from stevesbrain/master

Browse Source 
Fixing minor misspelling of the word: encrypted
This commit is contained in:
Joshua Tauberer 2015-05-24 22:12:16 -04:00
commit d6f26609fc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
management/backup.py
View File

@ -148,7 +148,7 @@ def perform_backup(full_backup):
old_backup_dir = os.path.join(backup_root, 'duplicity') old_backup_dir = os.path.join(backup_root, 'duplicity')
migrated_unencrypted_backup_dir = os.path.join(env["STORAGE_ROOT"], "migrated_unencrypted_backup") migrated_unencrypted_backup_dir = os.path.join(env["STORAGE_ROOT"], "migrated_unencrypted_backup")
if os.path.isdir(old_backup_dir): if os.path.isdir(old_backup_dir):
# Move the old unencrpyted files to a new location outside of # Move the old unencrypted files to a new location outside of
# the backup root so they get included in the next (new) backup. # the backup root so they get included in the next (new) backup.
# Then we'll delete them. Also so that they do not get in the # Then we'll delete them. Also so that they do not get in the
# way of duplicity doing a full backup on the first run after # way of duplicity doing a full backup on the first run after

2
management/templates/system-backup.html
View File

@ -11,7 +11,7 @@
<p>Many cloud providers make this easy by allowing you to take snapshots of the machine's disk.</p> <p>Many cloud providers make this easy by allowing you to take snapshots of the machine's disk.</p>
<p>You can also use SFTP (FTP over SSH) to copy files from <tt id="backup-location"></tt>. These files are encrpyted, so they are safe to store anywhere. Copy the encryption password from <tt id="backup-encpassword-file"></tt> also but keep it in a safe location.</p> <p>You can also use SFTP (FTP over SSH) to copy files from <tt id="backup-location"></tt>. These files are encrypted, so they are safe to store anywhere. Copy the encryption password from <tt id="backup-encpassword-file"></tt> also but keep it in a safe location.</p>
<h3>Current Backups</h3> <h3>Current Backups</h3>