diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-09-27 17:29:01 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-09-27 17:29:01 -0300 |
| commit | 11233840b1c822a323010c5f91f62389cc8e9368 (patch) | |
| tree | 44ca978fd869748cf2e8b2b29f67adfc3d3ff1e2 | |
| parent | ff32bc68bc51908abdd56c440b7570348f1834a8 (diff) | |
| download | hydra-11233840b1c822a323010c5f91f62389cc8e9368.tar.gz hydra-11233840b1c822a323010c5f91f62389cc8e9368.tar.bz2 | |
Support for restore method
| -rw-r--r-- | lib/hydra/backup | 5 | ||||
| -rwxr-xr-x | share/hydractl/backup-restore-site | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/lib/hydra/backup b/lib/hydra/backup index 210139b..260446d 100644 --- a/lib/hydra/backup +++ b/lib/hydra/backup @@ -36,10 +36,7 @@ function hydra_backup_environment { exit 1 fi else - if [ "$METHOD" == "restore" ]; then - echo "Invalid backup method 'restore'" - exit 1 - elif [ -d "$BACKUPDIR/$METHOD" ]; then + if [ -d "$BACKUPDIR/$METHOD" ]; then BACKUPDIR="$BACKUPDIR/$METHOD" else echo "Backup folder for $METHOD not found at $BACKUPDIR" diff --git a/share/hydractl/backup-restore-site b/share/hydractl/backup-restore-site index bf68779..16ebf93 100755 --- a/share/hydractl/backup-restore-site +++ b/share/hydractl/backup-restore-site @@ -8,7 +8,7 @@ source $APP_BASE/lib/hydra/functions || exit 1 hydra_config_load -SITE="$3" +SITE="$2" SITES="/var/sites" FOLDER="$SITES/$SITE" @@ -17,7 +17,7 @@ if [ -z "$SITE" ]; then exit 1 fi -hydra_backup_environment $* +hydra_backup_environment $1 restore # Check if folder exist on the backup if [ ! -d "$RESTOREDIR/$FOLDER" ]; then |