|
@@ -1868,16 +1868,23 @@ function create_backup_script {
|
1868
|
1868
|
|
1869
|
1869
|
echo '# Backup email' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
1870
|
1870
|
echo "if [ -d /home/$MY_USERNAME/Maildir ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
1871
|
|
- echo ' echo "Backing up emails"' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
1871
|
+ echo ' echo "Creating an email archive"' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
1872
|
+ echo ' if [ ! -d /root/backupemail ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
1873
|
+ echo " mkdir -p /root/backupemail" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
1874
|
+ echo ' fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
1875
|
+ echo " tar -czvf /root/backupemail/maildir.tar.gz /home/$MY_USERNAME/Maildir" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
1876
|
+ echo ' echo "Backing up emails"' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
1872
|
1877
|
echo " if [ ! -d $USB_MOUNT/backup/mail ]; then" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
1873
|
1878
|
echo " mkdir -p $USB_MOUNT/backup/mail" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
1874
|
1879
|
echo ' fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
1875
|
|
- echo " rsyncrypto -v -r /home/$MY_USERNAME/Maildir $USB_MOUNT/backup/mail $USB_MOUNT/backup/mail.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
1880
|
+ echo " rsyncrypto -v -r /root/backupemail $USB_MOUNT/backup/mail $USB_MOUNT/backup/mail.keys $BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
1876
|
1881
|
echo ' if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
1877
|
1882
|
echo " umount $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
1878
|
1883
|
echo " rm -rf $USB_MOUNT" >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
1884
|
+ echo ' rm -rf /root/backupemail' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
1879
|
1885
|
echo ' exit 396' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
1880
|
1886
|
echo ' fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
|
1887
|
+ echo ' rm -rf /root/backupemail' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
1881
|
1888
|
echo 'fi' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
1882
|
1889
|
echo '' >> /usr/bin/$BACKUP_SCRIPT_NAME
|
1883
|
1890
|
|
|
@@ -2467,7 +2474,7 @@ function create_restore_script {
|
2467
|
2474
|
echo " if [ ! -d /home/$MY_USERNAME/Maildir ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
2468
|
2475
|
echo " mkdir /home/$MY_USERNAME/Maildir" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
2469
|
2476
|
echo ' fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
2470
|
|
- echo " cp -r /root/tempmail/usb/backup/mail/$MY_USERNAME/Maildir/* /home/$MY_USERNAME/Maildir/" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
2477
|
+ echo ' tar -xzvf /root/tempmail/usb/backup/mail/backupemail/maildir.tar.gz' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
2471
|
2478
|
echo ' if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
2472
|
2479
|
echo " umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
2473
|
2480
|
echo " rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
@@ -3026,11 +3033,16 @@ function backup_to_friends_servers {
|
3026
|
3033
|
|
3027
|
3034
|
echo '# Backup email' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
3028
|
3035
|
echo "if [ -d /home/$MY_USERNAME/Maildir ]; then" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
|
3036
|
+ echo ' echo "Creating an email archive"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
|
3037
|
+ echo ' if [ ! -d /root/backupemail ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
|
3038
|
+ echo " mkdir -p /root/backupemail" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
|
3039
|
+ echo ' fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
|
3040
|
+ echo " tar -czvf /root/backupemail/maildir.tar.gz /home/$MY_USERNAME/Maildir" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
3029
|
3041
|
echo ' echo "Backing up emails"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
3030
|
3042
|
echo ' if [ ! -d $SERVER_DIRECTORY/backup/mail ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
3031
|
3043
|
echo ' mkdir -p $SERVER_DIRECTORY/backup/mail' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
3032
|
3044
|
echo ' fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
3033
|
|
- echo -n " rsyncrypto -v -r /home/$MY_USERNAME/Maildir " >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
|
3045
|
+ echo -n ' rsyncrypto -v -r /root/backupemail ' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
3034
|
3046
|
echo -n '$SERVER_DIRECTORY/backup/mail $SERVER_DIRECTORY/backup/mail.keys ' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
3035
|
3047
|
echo "$BACKUP_CERTIFICATE" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
3036
|
3048
|
echo ' if [ ! "$?" = "0" ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
|
@@ -3671,7 +3683,7 @@ function restore_from_friend {
|
3671
|
3683
|
echo " if [ ! -d /home/$MY_USERNAME/Maildir ]; then" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
|
3672
|
3684
|
echo " mkdir /home/$MY_USERNAME/Maildir" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
|
3673
|
3685
|
echo ' fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
|
3674
|
|
- echo " cp -r /root/tempmail/remoterestore/backup/mail/$MY_USERNAME/Maildir/* /home/$MY_USERNAME/Maildir/" >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
|
|
3686
|
+ echo ' tar -xzvf /root/tempmail/usb/backup/mail/backupemail/maildir.tar.gz' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
|
3675
|
3687
|
echo ' if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
|
3676
|
3688
|
echo ' exit 927' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
|
3677
|
3689
|
echo ' fi' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
|