Bob Mottram před 9 roky
rodič
revize
7de611fcc8
2 změnil soubory, kde provedl 28 přidání a 8 odebrání
  1. 10
    0
      src/freedombone-backup-local
  2. 18
    8
      src/freedombone-backup-remote

+ 10
- 0
src/freedombone-backup-local Zobrazit soubor

171
         fi
171
         fi
172
         obnam force-lock -r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}
172
         obnam force-lock -r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}
173
         obnam backup -r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}
173
         obnam backup -r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}
174
+        obnam verify -r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}
175
+        if [ ! "$?" = "0" ]; then
176
+            umount $USB_MOUNT
177
+            rm -rf $USB_MOUNT
178
+            if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
179
+                shred -zu ${1}/*
180
+                rm -rf ${1}
181
+            fi
182
+            exit 71
183
+        fi
174
         obnam forget --keep=30d -r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID
184
         obnam forget --keep=30d -r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID
175
         if [ ! "$?" = "0" ]; then
185
         if [ ! "$?" = "0" ]; then
176
             umount $USB_MOUNT
186
             umount $USB_MOUNT

+ 18
- 8
src/freedombone-backup-remote Zobrazit soubor

76
     if [ ! -d $SERVER_DIRECTORY/backup/${2} ]; then
76
     if [ ! -d $SERVER_DIRECTORY/backup/${2} ]; then
77
         mkdir -p $SERVER_DIRECTORY/backup/${2}
77
         mkdir -p $SERVER_DIRECTORY/backup/${2}
78
     fi
78
     fi
79
-    obnam force-lock -r $SERVER_DIRECTORY/backup/${2} --encrypt-with $ADMIN_BACKUP_KEY_ID ${1}
80
-    obnam backup -r $SERVER_DIRECTORY/backup/${2} --encrypt-with $ADMIN_BACKUP_KEY_ID ${1}
81
-    obnam forget --keep=30d -r $SERVER_DIRECTORY/backup/${2} --encrypt-with $ADMIN_BACKUP_KEY_ID
79
+    obnam force-lock -r $SERVER_DIRECTORY/backup/${2} --encrypt-with ${ADMIN_BACKUP_KEY_ID} ${1}
80
+    obnam backup -r $SERVER_DIRECTORY/backup/${2} --encrypt-with ${ADMIN_BACKUP_KEY_ID} ${1}
81
+    obnam verify -r $SERVER_DIRECTORY/backup/${2} --encrypt-with ${ADMIN_BACKUP_KEY_ID} ${1}
82
     if [ ! "$?" = "0" ]; then
82
     if [ ! "$?" = "0" ]; then
83
         if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
83
         if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
84
             shred -zu /root/temp${2}/*
84
             shred -zu /root/temp${2}/*
85
             rm -rf /root/temp${2}
85
             rm -rf /root/temp${2}
86
         fi
86
         fi
87
         # Send a warning email
87
         # Send a warning email
88
-        echo "Unable to backup ${2}" | mail -s "${PROJECT_NAME} backup to friends" $ADMIN_EMAIL_ADDRESS
88
+        echo "Unable to verify ${2}" | mail -s "${PROJECT_NAME} backup to friends" ${ADMIN_EMAIL_ADDRESS}
89
+        exit 953
90
+    fi
91
+    obnam forget --keep=30d -r $SERVER_DIRECTORY/backup/${2} --encrypt-with ${ADMIN_BACKUP_KEY_ID}
92
+    if [ ! "$?" = "0" ]; then
93
+        if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
94
+            shred -zu /root/temp${2}/*
95
+            rm -rf /root/temp${2}
96
+        fi
97
+        # Send a warning email
98
+        echo "Unable to backup ${2}" | mail -s "${PROJECT_NAME} backup to friends" ${ADMIN_EMAIL_ADDRESS}
89
         exit 853
99
         exit 853
90
     fi
100
     fi
91
     if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
101
     if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
127
     fi
137
     fi
128
     cp -f $CONFIG_FILE /root/tempbackupconfig
138
     cp -f $CONFIG_FILE /root/tempbackupconfig
129
     cp -f $COMPLETION_FILE /root/tempbackupconfig
139
     cp -f $COMPLETION_FILE /root/tempbackupconfig
130
-	if [ -f $BACKUP_EXTRA_DIRECTORIES ]; then
131
-		cp -f $BACKUP_EXTRA_DIRECTORIES /root/tempbackupconfig
132
-	fi
140
+    if [ -f $BACKUP_EXTRA_DIRECTORIES ]; then
141
+        cp -f $BACKUP_EXTRA_DIRECTORIES /root/tempbackupconfig
142
+    fi
133
     backup_directory_to_friend /root/tempbackupconfig config
143
     backup_directory_to_friend /root/tempbackupconfig config
134
 }
144
 }
135
 
145
 
486
         if [ -d "$backup_dir" ]; then
496
         if [ -d "$backup_dir" ]; then
487
             destination_dir=$(echo "$backup_line" | awk -F ',' '{print $2}' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
497
             destination_dir=$(echo "$backup_line" | awk -F ',' '{print $2}' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
488
             if [[ $(valid_backup_destination "$destination_dir") == "yes" ]]; then
498
             if [[ $(valid_backup_destination "$destination_dir") == "yes" ]]; then
489
-				backup_directory_to_friend "$backup_dir" "$destination_dir"
499
+                backup_directory_to_friend "$backup_dir" "$destination_dir"
490
             else
500
             else
491
                 echo $"WARNING: The backup directory $destination_dir is already used."
501
                 echo $"WARNING: The backup directory $destination_dir is already used."
492
                 echo $"Choose a different destination name for backing up $backup_dir"
502
                 echo $"Choose a different destination name for backing up $backup_dir"