diff --git a/plugins/backup/commands b/plugins/backup/commands index 3596e158f..7386d7ed1 100755 --- a/plugins/backup/commands +++ b/plugins/backup/commands @@ -57,7 +57,7 @@ set -e; case "$1" in TARGET_DIR="$DOKKU_ROOT" # create all the app directories - while read app; do mkdir "$TARGET_DIR/$app"; echo "Imported $app"; done < $BACKUP_TMP_DIR/.dokku_backup_apps > /dev/null + while read app; do mkdir "$TARGET_DIR/$app"; echo "Imported $app"; done < $BACKUP_TMP_DIR/.dokku_backup_apps # have the plugins import their stuff pluginhook backup-import $VERSION "$BACKUP_ROOT" $TARGET_DIR "$BACKUP_TMP_DIR/.dokku_backup_apps" diff --git a/plugins/config/backup-export b/plugins/config/backup-export index e0cbe54bc..68b5c0393 100755 --- a/plugins/config/backup-export +++ b/plugins/config/backup-export @@ -1,6 +1,7 @@ #!/usr/bin/env bash set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x +shopt -s nullglob VERSION="$1" BASE_DIR="$2" -cat; find $BASE_DIR -regex ".*/ENV" +cat; for i in $BASE_DIR/*/ENV; do echo $i; done diff --git a/plugins/config/backup-import b/plugins/config/backup-import index 520ba53f1..9ed3b1eca 100755 --- a/plugins/config/backup-import +++ b/plugins/config/backup-import @@ -1,10 +1,11 @@ #!/usr/bin/env bash set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x +shopt -s nullglob VERSION="$1" IMPORT_DIR="$2" TARGET_DIR="$3" cd $IMPORT_DIR -for file in `find . -regex ".*/ENV"`; do +for file in */ENV; do cp $file "$TARGET_DIR/$file" done diff --git a/plugins/nginx-vhosts/backup-export b/plugins/nginx-vhosts/backup-export index 07f9c97e0..465d0d18e 100755 --- a/plugins/nginx-vhosts/backup-export +++ b/plugins/nginx-vhosts/backup-export @@ -1,6 +1,7 @@ #!/usr/bin/env bash set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x +shopt -s nullglob VERSION="$1" BASE_DIR="$2" -cat; find $BASE_DIR -regex ".*ssl/server\(.crt\|.key\)"; +cat; for i in $BASE_DIR/*/ssl/server.*; do echo $i; done diff --git a/plugins/nginx-vhosts/backup-import b/plugins/nginx-vhosts/backup-import index 21c32f1b4..6b88fe0b4 100755 --- a/plugins/nginx-vhosts/backup-import +++ b/plugins/nginx-vhosts/backup-import @@ -1,12 +1,13 @@ #!/usr/bin/env bash set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x +shopt -s nullglob VERSION="$1" IMPORT_DIR="$2" TARGET_DIR="$3" cd $IMPORT_DIR -for file in `find . -regex ".*ssl/server\(.crt\|.key\)"`; do +for file in */ssl/server.*; do mkdir -p $(dirname $TARGET_DIR$file) cp $file $TARGET_DIR$file done