diff --git a/setup/start/sudoers b/setup/start/sudoers index 1434b192e..8177e641e 100644 --- a/setup/start/sudoers +++ b/setup/start/sudoers @@ -16,9 +16,6 @@ yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/backupbox.sh Defaults!/home/yellowtent/box/src/scripts/backupapp.sh env_keep="HOME BOX_ENV" yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/backupapp.sh -Defaults!/home/yellowtent/box/src/scripts/restoreapp.sh env_keep="HOME BOX_ENV" -yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/restoreapp.sh - Defaults!/home/yellowtent/box/src/scripts/reboot.sh env_keep="HOME BOX_ENV" yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/reboot.sh diff --git a/src/backups.js b/src/backups.js index 20b2bbe67..7f55ef89b 100644 --- a/src/backups.js +++ b/src/backups.js @@ -48,8 +48,7 @@ var addons = require('./addons.js'), util = require('util'); var BACKUP_BOX_CMD = path.join(__dirname, 'scripts/backupbox.sh'), - BACKUP_APP_CMD = path.join(__dirname, 'scripts/backupapp.sh'), - RESTORE_APP_CMD = path.join(__dirname, 'scripts/restoreapp.sh'); + BACKUP_APP_CMD = path.join(__dirname, 'scripts/backupapp.sh'); var NOOP_CALLBACK = function (error) { if (error) debug(error); }; diff --git a/src/scripts/restoreapp.sh b/src/scripts/restoreapp.sh deleted file mode 100755 index d4989a7de..000000000 --- a/src/scripts/restoreapp.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -set -eu -o pipefail - -if [[ $EUID -ne 0 ]]; then - echo "This script should be run as root." >&2 - exit 1 -fi - -if [[ $# == 1 && "$1" == "--check" ]]; then - echo "OK" - exit 0 -fi - -if [ $# -lt 3 ]; then - echo "Usage: restoreapp.sh [aws session token]" - exit 1 -fi - -readonly APPS_DATA_DIR="${HOME}/appsdata" -readonly curl="curl --fail --connect-timeout 20 --retry 10 --retry-delay 2 --max-time 2400" - -app_id="$1" -restore_url="$2" -restore_key="$3" -session_token="$4" # unused since it seems to be part of the url query param in v4 signature - -echo "Downloading backup: ${restore_url} and key: ${restore_key}" - -for try in `seq 1 5`; do - echo "Download backup from ${restore_url} (try ${try})" - error_log=$(mktemp) - - if $curl -L "${restore_url}" \ - | openssl aes-256-cbc -d -pass "pass:${restore_key}" \ - | 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}" -done - -if [[ ${try} -eq 5 ]]; then - echo "restore failed" - exit 3 -else - echo "restore successful" -fi diff --git a/src/test/checkInstall b/src/test/checkInstall index 97c2a6923..8728fe0b7 100755 --- a/src/test/checkInstall +++ b/src/test/checkInstall @@ -16,7 +16,6 @@ scripts=("${SOURCE_DIR}/src/scripts/rmappdir.sh" \ "${SOURCE_DIR}/src/scripts/backupapp.sh" \ "${SOURCE_DIR}/src/scripts/rmbackup.sh" \ "${SOURCE_DIR}/src/scripts/cpbackup.sh" \ - "${SOURCE_DIR}/src/scripts/restoreapp.sh" \ "${SOURCE_DIR}/src/scripts/reboot.sh" \ "${SOURCE_DIR}/src/scripts/update.sh" \ "${SOURCE_DIR}/src/scripts/collectlogs.sh" \