jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Use APPS_DATA_DIR in app backup and restore scripts

Browse Source
This commit is contained in:
Johannes Zellner
2017-03-29 16:22:41 +02:00
parent 3a17bf9a0f
commit 9c6324631d
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/scripts/backupapp.sh
View File

@@ -12,7 +12,7 @@ if [[ $# == 1 && "$1" == "--check" ]]; then
exit 0
fi
readonly DATA_DIR="${HOME}/data"
readonly APPS_DATA_DIR="${HOME}/appsdata"
# verify argument count
if [[ "$1" == "s3" && $# -lt 9 ]]; then
@@ -51,8 +51,8 @@ fi
# perform backup
readonly now=$(date "+%Y-%m-%d-%H%M%S")
readonly app_data_dir="${DATA_DIR}/${app_id}"
readonly app_data_snapshot="${DATA_DIR}/snapshots/${app_id}-${now}"
readonly app_data_dir="${APPS_DATA_DIR}/${app_id}"
readonly app_data_snapshot="${APPS_DATA_DIR}/snapshots/${app_id}-${now}"
btrfs subvolume snapshot -r "${app_data_dir}" "${app_data_snapshot}"

7
src/scripts/restoreapp.sh
View File

@@ -17,7 +17,7 @@ if [ $# -lt 3 ]; then
exit 1
fi
readonly DATA_DIR="${HOME}/data"
readonly APPS_DATA_DIR="${HOME}/appsdata"
readonly curl="curl --fail --connect-timeout 20 --retry 10 --retry-delay 2 --max-time 2400"
app_id="$1"
@@ -33,8 +33,8 @@ for try in `seq 1 5`; do
if $curl -L "${restore_url}" \
| openssl aes-256-cbc -d -pass "pass:${restore_key}" \
| tar -zxf - -C "${DATA_DIR}/${app_id}" 2>"${error_log}"; then
chown -R yellowtent:yellowtent "${DATA_DIR}/${app_id}"
| tar -zxf - -C "${APPS_DATA_DIR}/${app_id}" 2>"${error_log}"; then
chown -R yellowtent:yellowtent "${APPS_DATA_DIR}/${app_id}"
break
fi
cat "${error_log}" && rm "${error_log}"
@@ -46,4 +46,3 @@ if [[ ${try} -eq 5 ]]; then
else
echo "restore successful"
fi