backupninja: merged pull on rub handler

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@240 370017ae-e619-0410-ac65-c121f96126d4

3 files changed, 25 insertions, 97 deletions

diff --git a/backupninja/backupninja.SlackBuild b/backupninja/backupninja.SlackBuild
index 4a660987..86ccaddf 100755
--- a/backupninja/backupninja.SlackBuild
+++ b/backupninja/backupninja.SlackBuild
@@ -65,7 +65,6 @@ make
 make DESTDIR=$TMP/package-$PACKAGE install
 
 cp $CWD/rub $TMP/package-$PACKAGE/usr/share/$PACKAGE/
-cp $CWD/pull $TMP/package-$PACKAGE/usr/share/$PACKAGE/
 rm -rf $TMP/package-$PACKAGE/etc/cron.d
 mkdir $TMP/package-$PACKAGE/etc/cron.hourly
 cp $CWD/backupninja.cron $TMP/package-$PACKAGE/etc/cron.hourly/backupninja
diff --git a/backupninja/pull b/backupninja/pull
deleted file mode 100755
index a5333055..00000000
--- a/backupninja/pull
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# backupninja handler to do incremental pull backups using
-# rsync and hardlinks; this script grabs folders from a remote
-# server and stores incrementally in a local folder. its based on
-#
-#   http://www.mikerubel.org/computers/rsync_snapshots/
-#
-# feedback: rhatto at riseup.net | gpl
-#
-
-setsection general
-getconf log /var/log/backupninja-pull.log
-getconf backupdir
-getconf rotate
-getconf days
-
-setsection source
-getconf user
-getconf server
-getconf include
-getconf exclude
-getconf ssh
-getconf rsync
-
-function rotate {
-
-  # please use an absolute path
-
-  if [[ "$2" < 4 ]]; then
-    error "Rotate: minimum of 4 rotations"
-    exit 1
-  fi
-
-  if [ -d $1.$2 ]; then
-    mv $1.$2 $1.tmp
-  fi
-
-  for ((n=`echo "$2 - 1" | bc`; n >= 0; n--)); do
-    if [ -d $1.$n ]; then
-      dest=`echo "$n + 1" | bc`
-      mv $1.$n $1.$dest
-      touch $1.$dest
-    fi
-  done
-
-  if [ -d $1.tmp ]; then
-    mv $1.tmp $1.0
-  fi
-
-  if [ -d $1.1 ]; then
-    cp -alf $1.1/. $1.0
-  fi
-
-}
-
-backupdir="/$backupdir"
-
-if [ ! -d "$backupdir" ]; then 
-  error "Backupdir $backupdir does not exist"
-  exit 1
-fi
-
-if [ -z "$days" ]; then
-  keep="4"
-else
-  keep="`echo $days - 1 | bc -l`"
-fi
-
-for path in $exclude; do
-  EXCLUDES="$EXCLUDES --exclude=$path"
-done
-
-echo "Starting backup at `date`" >> $log
-
-for SECTION in $include; do
-
-  section="`basename $SECTION`"
-
-  if [ ! -d "$backupdir/$SECTION/$section.0" ]; then
-    mkdir -p $backupdir/$SECTION/$section.0
-  fi
-
-  info "Rotating $backupdir/$SECTION/$SECTION..."
-  echo "Rotating $backupdir/$SECTION/$SECTION..." >> $log
-  rotate $backupdir/$SECTION/$section $keep
-  info "Syncing $SECTION on $backupdir/$SECTION/$section.0..."
-
-  $rsync "$ssh $user@$server:/$SECTION/ $backupdir/$SECTION/$section.0 >> $log
-  touch $backupdir/$SECTION/$section.0
-
-done  
-
-echo "Finnishing backup at `date`" >> $log
diff --git a/backupninja/rub b/backupninja/rub
index cee94821..ae6373a9 100755
--- a/backupninja/rub
+++ b/backupninja/rub
@@ -22,6 +22,9 @@
 #   [source]
 #   include = include folder on backup
 #   exclude = exclude folder on backup
+#   type = local or remote
+#   ssh = ssh command line (remote only)
+#   rsync = rsync command line
 #
 #   [services]
 #   initscripts = absolute path where scripts are located
@@ -40,6 +43,11 @@ getconf days
 getconf lockfile
 
 setsection source
+getconf type local
+getconf rsync rsync -av --delete
+getconf ssh ssh
+getconf user
+getconf host
 getconf include
 getconf exclude
 
@@ -126,11 +134,25 @@ for SECTION in $include; do
     mkdir -p $backupdir/$SECTION/$section.0
   fi
  
-  info "Rotating $backupdir/$SECTION/$SECTION..."
-  echo "Rotating $backupdir/$SECTION/$SECTION..." >> $log
+  info "Rotating $backupdir/$SECTION/$section..."
+  echo "Rotating $backupdir/$SECTION/$section..." >> $log
   rotate $backupdir/$SECTION/$section $keep
   info "Syncing $SECTION on $backupdir/$SECTION/$section.0..."
-  rsync -av --delete $EXCLUDES /$SECTION/ $backupdir/$SECTION/$section.0/ >> $log
+
+  if [ "$type" == "local" ] then
+    $rsync $EXCLUDES /$SECTION/ $backupdir/$SECTION/$section.0/ >> $log
+  elif [ "$type" == "remote" ]; then
+    if [ -z "$user" ] || [ -z "$host" ]; then
+      error "Config file error: either user or host was not specified"
+      exit 1
+    else
+      $rsync "$ssh" $user@$host:/$SECTION/ $backupdir/$SECTION/$section.0 >> $log
+    fi
+  else
+    error "Invalid source type $type"
+    exit 1
+  fi
+
   touch $backupdir/$SECTION/$section.0
 
 done