|
@@ -35,6 +35,7 @@ SUSPENDED_SITE=
|
35
|
35
|
BACKUP_DUMMY_PASSWORD='backup'
|
36
|
36
|
|
37
|
37
|
BACKUP_TEMP_DIRECTORY=/root/.backuptemp
|
|
38
|
+BACKUPS_GPG_OPTIONS="--no-show-photos --pinentry-mode loopback"
|
38
|
39
|
|
39
|
40
|
function create_backups_temp_directory {
|
40
|
41
|
if [ ! -d $BACKUP_TEMP_DIRECTORY ]; then
|
|
@@ -263,7 +264,7 @@ function set_obnam_client_name {
|
263
|
264
|
|
264
|
265
|
function backup_directory_to_usb_duplicity {
|
265
|
266
|
create_backups_temp_directory
|
266
|
|
- echo "$BACKUP_DUMMY_PASSWORD" | duplicity full --tempdir $BACKUP_TEMP_DIRECTORY --encrypt-key $MY_BACKUP_KEY_ID --full-if-older-than 4W --exclude-other-filesystems ${1} file://$USB_MOUNT/backup/${2}
|
|
267
|
+ echo "$BACKUP_DUMMY_PASSWORD" | duplicity full --gpg-options "$BACKUPS_GPG_OPTIONS" --tempdir $BACKUP_TEMP_DIRECTORY --encrypt-key $MY_BACKUP_KEY_ID --full-if-older-than 4W --exclude-other-filesystems ${1} file://$USB_MOUNT/backup/${2}
|
267
|
268
|
if [ ! "$?" = "0" ]; then
|
268
|
269
|
umount $USB_MOUNT
|
269
|
270
|
rm -rf $USB_MOUNT
|
|
@@ -277,7 +278,7 @@ function backup_directory_to_usb_duplicity {
|
277
|
278
|
exit 8352925
|
278
|
279
|
fi
|
279
|
280
|
if [[ $ENABLE_BACKUP_VERIFICATION == "yes" ]]; then
|
280
|
|
- echo "$BACKUP_DUMMY_PASSWORD" | duplicity verify --tempdir $BACKUP_TEMP_DIRECTORY --encrypt-key $MY_BACKUP_KEY_ID --full-if-older-than 4W --exclude-other-filesystems ${1} file://$USB_MOUNT/backup/${2}
|
|
281
|
+ echo "$BACKUP_DUMMY_PASSWORD" | duplicity verify --gpg-options "$BACKUPS_GPG_OPTIONS" --tempdir $BACKUP_TEMP_DIRECTORY --encrypt-key $MY_BACKUP_KEY_ID --full-if-older-than 4W --exclude-other-filesystems ${1} file://$USB_MOUNT/backup/${2}
|
281
|
282
|
if [ ! "$?" = "0" ]; then
|
282
|
283
|
umount $USB_MOUNT
|
283
|
284
|
rm -rf $USB_MOUNT
|
|
@@ -360,7 +361,7 @@ function restore_directory_from_usb_obnam {
|
360
|
361
|
|
361
|
362
|
function restore_directory_from_usb_duplicity {
|
362
|
363
|
create_backups_temp_directory
|
363
|
|
- echo "$BACKUP_DUMMY_PASSWORD" | duplicity restore --tempdir $BACKUP_TEMP_DIRECTORY --force file://$USB_MOUNT/backup/${2} ${1}
|
|
364
|
+ echo "$BACKUP_DUMMY_PASSWORD" | duplicity restore --gpg-options "$BACKUPS_GPG_OPTIONS" --tempdir $BACKUP_TEMP_DIRECTORY --force file://$USB_MOUNT/backup/${2} ${1}
|
364
|
365
|
remove_backups_temp_directory
|
365
|
366
|
}
|
366
|
367
|
|
|
@@ -389,7 +390,7 @@ function restore_directory_from_friend_obnam {
|
389
|
390
|
|
390
|
391
|
function restore_directory_from_friend_duplicity {
|
391
|
392
|
create_backups_temp_directory
|
392
|
|
- echo "$BACKUP_DUMMY_PASSWORD" | duplicity restore --tempdir $BACKUP_TEMP_DIRECTORY --force file://$SERVER_DIRECTORY/backup/${2} ${1}
|
|
393
|
+ echo "$BACKUP_DUMMY_PASSWORD" | duplicity restore --gpg-options "$BACKUPS_GPG_OPTIONS" --tempdir $BACKUP_TEMP_DIRECTORY --force file://$SERVER_DIRECTORY/backup/${2} ${1}
|
393
|
394
|
remove_backups_temp_directory
|
394
|
395
|
}
|
395
|
396
|
|
|
@@ -435,7 +436,7 @@ function set_user_permissions {
|
435
|
436
|
|
436
|
437
|
function backup_directory_to_friend_duplicity {
|
437
|
438
|
create_backups_temp_directory
|
438
|
|
- echo "$BACKUP_DUMMY_PASSWORD" | duplicity full --tempdir $BACKUP_TEMP_DIRECTORY --ssh-askpass --encrypt-key ${ADMIN_BACKUP_KEY_ID} --full-if-older-than 4W --exclude-other-filesystems ${1} $SERVER_DIRECTORY/backup/${2}
|
|
439
|
+ echo "$BACKUP_DUMMY_PASSWORD" | duplicity full --gpg-options "$BACKUPS_GPG_OPTIONS" --tempdir $BACKUP_TEMP_DIRECTORY --ssh-askpass --encrypt-key ${ADMIN_BACKUP_KEY_ID} --full-if-older-than 4W --exclude-other-filesystems ${1} $SERVER_DIRECTORY/backup/${2}
|
439
|
440
|
if [ ! "$?" = "0" ]; then
|
440
|
441
|
if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
|
441
|
442
|
shred -zu ${1}/*
|
|
@@ -447,7 +448,7 @@ function backup_directory_to_friend_duplicity {
|
447
|
448
|
exit 5293526
|
448
|
449
|
fi
|
449
|
450
|
if [[ $ENABLE_BACKUP_VERIFICATION == "yes" ]]; then
|
450
|
|
- echo "$BACKUP_DUMMY_PASSWORD" | duplicity verify --tempdir $BACKUP_TEMP_DIRECTORY --ssh-askpass --encrypt-key ${ADMIN_BACKUP_KEY_ID} --full-if-older-than 4W --exclude-other-filesystems ${1} $SERVER_DIRECTORY/backup/${2}
|
|
451
|
+ echo "$BACKUP_DUMMY_PASSWORD" | duplicity verify --gpg-options "$BACKUPS_GPG_OPTIONS" --tempdir $BACKUP_TEMP_DIRECTORY --ssh-askpass --encrypt-key ${ADMIN_BACKUP_KEY_ID} --full-if-older-than 4W --exclude-other-filesystems ${1} $SERVER_DIRECTORY/backup/${2}
|
451
|
452
|
if [ ! "$?" = "0" ]; then
|
452
|
453
|
if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
|
453
|
454
|
shred -zu ${1}/*
|