Explorar o código

Fix UPYUN backup

lj2007331@gmail.com %!s(int64=7) %!d(string=hai) anos
pai
achega
e15d86c1ac
Modificáronse 3 ficheiros con 5 adicións e 3 borrados
  1. 3 2
      backup.sh
  2. 1 0
      backup_setup.sh
  3. 1 1
      options.conf

+ 3 - 2
backup.sh

@@ -50,7 +50,7 @@ DB_UPYUN_BK() {
     DB_GREP="DB_${D}_`date +%Y`"
     DB_FILE=`ls -lrt $backup_dir | grep ${DB_GREP} | tail -1 | awk '{print $NF}'`
     /usr/local/bin/upx put $backup_dir/$DB_FILE /`date +%F`/$DB_FILE
-    [ $? -eq 0 ] && /usr/local/bin/upx rm -d `date +%F --date="$expired_days days ago"` > /dev/null 2>&1
+    [ $? -eq 0 ] && /usr/local/bin/upx rm -a `date +%F --date="$expired_days days ago"` > /dev/null 2>&1
   done
 }
 
@@ -98,6 +98,7 @@ WEB_UPYUN_BK() {
   for W in `echo $website_name | tr ',' ' '`
   do
     [ ! -e "$wwwroot_dir/$WebSite" ] && { echo "[$wwwroot_dir/$WebSite] not exist"; break; }
+    [ ! -e "$backup_dir" ] && mkdir -p $backup_dir
     PUSH_FILE="$backup_dir/Web_${W}_$(date +%Y%m%d_%H).tgz"
     if [ ! -e "$PUSH_FILE" ]; then
       pushd $wwwroot_dir
@@ -106,7 +107,7 @@ WEB_UPYUN_BK() {
     fi
     /usr/local/bin/upx put $PUSH_FILE /`date +%F`/Web_${W}_$(date +%Y%m%d_%H).tgz
     if [ $? -eq 0 ]; then
-      /usr/local/bin/upx rm -d `date +%F --date="$expired_days days ago"` > /dev/null 2>&1 
+      /usr/local/bin/upx rm -a `date +%F --date="$expired_days days ago"` > /dev/null 2>&1 
       [ -e "$PUSH_FILE" -a -z "`echo $backup_destination | grep -ow 'local'`" ] && rm -rf $PUSH_FILE
     fi
   done

+ 1 - 0
backup_setup.sh

@@ -52,6 +52,7 @@ sed -i 's@^backup_destination=.*@backup_destination=@' ./options.conf
 [ `echo $DESC_BK | grep -e 2` ] && sed -i 's@^backup_destination=.*@&,remote@' ./options.conf
 [ `echo $DESC_BK | grep -e 3` ] && sed -i 's@^backup_destination=.*@&,cos@' ./options.conf
 [ `echo $DESC_BK | grep -e 4` ] && sed -i 's@^backup_destination=.*@&,upyun@' ./options.conf
+sed -i 's@^backup_destination=,@backup_destination=@' ./options.conf
 
 while :; do echo
   echo 'Please select your backup content:'

+ 1 - 1
options.conf

@@ -66,7 +66,7 @@ backup_dir=/data/backup
 # How many days before the backup directory will be removed
 expired_days=5
 
-# local ; remote ; local,remote
+# local ; remote ; upyun ; local,upyun
 backup_destination=
 
 # db ; web, You can't change