Ver código fonte

Disable backup verify

Bob Mottram 9 anos atrás
pai
commit
ffb924491b
2 arquivos alterados com 30 adições e 18 exclusões
  1. 15
    9
      src/freedombone-backup-local
  2. 15
    9
      src/freedombone-backup-remote

+ 15
- 9
src/freedombone-backup-local Ver arquivo

@@ -31,6 +31,7 @@
31 31
 PROJECT_NAME='freedombone'
32 32
 COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
33 33
 BACKUP_EXTRA_DIRECTORIES=/root/backup-extra-dirs.csv
34
+ENABLE_VERIFICATION="no"
34 35
 
35 36
 export TEXTDOMAIN=${PROJECT_NAME}-backup-local
36 37
 export TEXTDOMAINDIR="/usr/share/locale"
@@ -60,6 +61,9 @@ fi
60 61
 
61 62
 function suspend_site {
62 63
     # suspends a given website
64
+    if [[ $ENABLE_VERIFICATION != "yes" ]]; then
65
+        return
66
+    fi
63 67
     SUSPENDED_SITE="$1"
64 68
     nginx_dissite $SUSPENDED_SITE
65 69
     service nginx reload
@@ -202,16 +206,18 @@ function backup_directory_to_usb {
202 206
         fi
203 207
         obnam force-lock -r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}
204 208
         obnam backup -r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}
205
-        obnam verify -r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}
206
-        if [ ! "$?" = "0" ]; then
207
-            umount $USB_MOUNT
208
-            rm -rf $USB_MOUNT
209
-            if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
210
-                shred -zu ${1}/*
211
-                rm -rf ${1}
209
+        if [[ $ENABLE_VERIFICATION == "yes" ]]; then
210
+            obnam verify -r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}
211
+            if [ ! "$?" = "0" ]; then
212
+                umount $USB_MOUNT
213
+                rm -rf $USB_MOUNT
214
+                if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
215
+                    shred -zu ${1}/*
216
+                    rm -rf ${1}
217
+                fi
218
+                restart_site
219
+                exit 71
212 220
             fi
213
-            restart_site
214
-            exit 71
215 221
         fi
216 222
         obnam forget --keep=30d -r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID
217 223
         if [ ! "$?" = "0" ]; then

+ 15
- 9
src/freedombone-backup-remote Ver arquivo

@@ -32,6 +32,7 @@ PROJECT_NAME='freedombone'
32 32
 COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
33 33
 CONFIG_FILE=$HOME/${PROJECT_NAME}.cfg
34 34
 BACKUP_EXTRA_DIRECTORIES=/root/backup-extra-dirs.csv
35
+ENABLE_VERIFICATION="no"
35 36
 
36 37
 export TEXTDOMAIN=${PROJECT_NAME}-backup-remote
37 38
 export TEXTDOMAINDIR="/usr/share/locale"
@@ -72,6 +73,9 @@ SUSPENDED_SITE=
72 73
 
73 74
 function suspend_site {
74 75
     # suspends a given website
76
+    if [[ $ENABLE_VERIFICATION != "yes" ]]; then
77
+        return
78
+    fi
75 79
     SUSPENDED_SITE="$1"
76 80
     nginx_dissite $SUSPENDED_SITE
77 81
     service nginx reload
@@ -100,16 +104,18 @@ function backup_directory_to_friend {
100 104
     fi
101 105
     obnam force-lock -r $SERVER_DIRECTORY/backup/${2} --encrypt-with ${ADMIN_BACKUP_KEY_ID} ${1}
102 106
     obnam backup -r $SERVER_DIRECTORY/backup/${2} --encrypt-with ${ADMIN_BACKUP_KEY_ID} ${1}
103
-    obnam verify -r $SERVER_DIRECTORY/backup/${2} --encrypt-with ${ADMIN_BACKUP_KEY_ID} ${1}
104
-    if [ ! "$?" = "0" ]; then
105
-        if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
106
-            shred -zu /root/temp${2}/*
107
-            rm -rf /root/temp${2}
107
+    if [[ $ENABLE_VERIFICATION == "yes" ]]; then
108
+        obnam verify -r $SERVER_DIRECTORY/backup/${2} --encrypt-with ${ADMIN_BACKUP_KEY_ID} ${1}
109
+        if [ ! "$?" = "0" ]; then
110
+            if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
111
+                shred -zu /root/temp${2}/*
112
+                rm -rf /root/temp${2}
113
+            fi
114
+            # Send a warning email
115
+            echo "Unable to verify ${2}" | mail -s "${PROJECT_NAME} backup to friends" ${ADMIN_EMAIL_ADDRESS}
116
+            restart_site
117
+            exit 953
108 118
         fi
109
-        # Send a warning email
110
-        echo "Unable to verify ${2}" | mail -s "${PROJECT_NAME} backup to friends" ${ADMIN_EMAIL_ADDRESS}
111
-        restart_site
112
-        exit 953
113 119
     fi
114 120
     obnam forget --keep=30d -r $SERVER_DIRECTORY/backup/${2} --encrypt-with ${ADMIN_BACKUP_KEY_ID}
115 121
     if [ ! "$?" = "0" ]; then