瀏覽代碼

gpg passphrase

Bob Mottram 7 年之前
父節點
當前提交
99d7f7baa6
共有 2 個檔案被更改,包括 13 行新增2 行删除
  1. 6
    0
      src/freedombone-app-cryptpad
  2. 7
    2
      src/freedombone-utils-backup

+ 6
- 0
src/freedombone-app-cryptpad 查看文件

122
         temp_restore_dir=/root/tempcryptpad
122
         temp_restore_dir=/root/tempcryptpad
123
         function_check restore_directory_from_usb
123
         function_check restore_directory_from_usb
124
         restore_directory_from_usb $temp_restore_dir cryptpad
124
         restore_directory_from_usb $temp_restore_dir cryptpad
125
+        if [ ! -d $temp_restore_dir$CRYPTPAD_DIR/datastore ]; then
126
+            systemctl start cryptpad
127
+            echo 'Failed to restore cryptpad'
128
+            rm -rf $temp_restore_dir
129
+        fi
125
         cp -r $temp_restore_dir$CRYPTPAD_DIR/datastore/* $CRYPTPAD_DIR/datastore/
130
         cp -r $temp_restore_dir$CRYPTPAD_DIR/datastore/* $CRYPTPAD_DIR/datastore/
131
+        rm -rf $temp_restore_dir
126
         systemctl start cryptpad
132
         systemctl start cryptpad
127
     fi
133
     fi
128
 }
134
 }

+ 7
- 2
src/freedombone-utils-backup 查看文件

361
 
361
 
362
 function restore_directory_from_usb_duplicity {
362
 function restore_directory_from_usb_duplicity {
363
     create_backups_temp_directory
363
     create_backups_temp_directory
364
-    echo "$BACKUP_DUMMY_PASSWORD" | duplicity restore --gpg-options "$BACKUP_GPG_OPTIONS" --tempdir $BACKUP_TEMP_DIRECTORY --force file://$USB_MOUNT/backup/${2} ${1}
364
+    PASSPHRASE="$BACKUP_DUMMY_PASSWORD" duplicity restore --gpg-options "$BACKUP_GPG_OPTIONS" --tempdir $BACKUP_TEMP_DIRECTORY --force file://$USB_MOUNT/backup/${2} ${1}
365
+    if [ ! "$?" = "0" ]; then
366
+        echo "WARNING: failed to restore $USB_MOUNT/backup/${2} to ${1}"
367
+    fi
368
+    PASSPHRASE=
365
     remove_backups_temp_directory
369
     remove_backups_temp_directory
366
 }
370
 }
367
 
371
 
390
 
394
 
391
 function restore_directory_from_friend_duplicity {
395
 function restore_directory_from_friend_duplicity {
392
     create_backups_temp_directory
396
     create_backups_temp_directory
393
-    echo "$BACKUP_DUMMY_PASSWORD" | duplicity restore --gpg-options "$BACKUP_GPG_OPTIONS" --tempdir $BACKUP_TEMP_DIRECTORY --force file://$SERVER_DIRECTORY/backup/${2} ${1}
397
+    PASSPHRASE="$BACKUP_DUMMY_PASSWORD" duplicity restore --gpg-options "$BACKUP_GPG_OPTIONS" --tempdir $BACKUP_TEMP_DIRECTORY --force file://$SERVER_DIRECTORY/backup/${2} ${1}
398
+    PASSPHRASE=
394
     remove_backups_temp_directory
399
     remove_backups_temp_directory
395
 }
400
 }
396
 
401