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

rename backuptask to backupupload

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-11-15 11:21:21 -08:00
parent 72fc6b8c5a
commit 6abd48d480
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
setup/start/sudoers
View File

@@ -31,8 +31,8 @@ yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/authorized_keys
Defaults!/home/yellowtent/box/src/scripts/configurelogrotate.sh env_keep="HOME BOX_ENV" Defaults!/home/yellowtent/box/src/scripts/configurelogrotate.sh env_keep="HOME BOX_ENV"
yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/configurelogrotate.sh yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/configurelogrotate.sh
Defaults!/home/yellowtent/box/src/backuptask.js env_keep="HOME BOX_ENV" Defaults!/home/yellowtent/box/src/backupupload.js env_keep="HOME BOX_ENV"
yellowtent ALL=(root) NOPASSWD:SETENV: /home/yellowtent/box/src/backuptask.js yellowtent ALL=(root) NOPASSWD:SETENV: /home/yellowtent/box/src/backupupload.js
Defaults!/home/yellowtent/box/src/scripts/restart.sh env_keep="HOME BOX_ENV" Defaults!/home/yellowtent/box/src/scripts/restart.sh env_keep="HOME BOX_ENV"
yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/restart.sh yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/restart.sh

4
src/backups.js
View File

@@ -66,7 +66,7 @@ var addons = require('./addons.js'),
var NOOP_CALLBACK = function (error) { if (error) debug(error); }; var NOOP_CALLBACK = function (error) { if (error) debug(error); };
var BACKUPTASK_CMD = path.join(__dirname, 'backuptask.js'); var BACKUP_UPLOAD_CMD = path.join(__dirname, 'backupupload.js');
function debugApp(app) { function debugApp(app) {
assert(typeof app === 'object'); assert(typeof app === 'object');
@@ -610,7 +610,7 @@ function runBackupTask(backupId, format, dataDir, callback) {
var killTimerId = null, progressTimerId = null; var killTimerId = null, progressTimerId = null;
var logStream = fs.createWriteStream(paths.BACKUP_LOG_FILE, { flags: 'a' }); var logStream = fs.createWriteStream(paths.BACKUP_LOG_FILE, { flags: 'a' });
var cp = shell.sudo(`backup-${backupId}`, [ BACKUPTASK_CMD, backupId, format, dataDir ], { env: process.env, logStream: logStream }, function (error) { var cp = shell.sudo(`backup-${backupId}`, [ BACKUP_UPLOAD_CMD, backupId, format, dataDir ], { env: process.env, logStream: logStream }, function (error) {
clearTimeout(killTimerId); clearTimeout(killTimerId);
clearInterval(progressTimerId); clearInterval(progressTimerId);

2
src/backuptask.js → src/backupupload.js
View File

@@ -17,7 +17,7 @@ require('debug').formatArgs = function formatArgs(args) {
var assert = require('assert'), var assert = require('assert'),
backups = require('./backups.js'), backups = require('./backups.js'),
database = require('./database.js'), database = require('./database.js'),
debug = require('debug')('box:backuptask'), debug = require('debug')('box:backupupload'),
paths = require('./paths.js'), paths = require('./paths.js'),
safe = require('safetydance'); safe = require('safetydance');

2
src/test/checkInstall
View File

@@ -17,7 +17,7 @@ scripts=("${SOURCE_DIR}/src/scripts/rmvolume.sh" \
"${SOURCE_DIR}/src/scripts/collectlogs.sh" \ "${SOURCE_DIR}/src/scripts/collectlogs.sh" \
"${SOURCE_DIR}/src/scripts/configurecollectd.sh" \ "${SOURCE_DIR}/src/scripts/configurecollectd.sh" \
"${SOURCE_DIR}/src/scripts/authorized_keys.sh" \ "${SOURCE_DIR}/src/scripts/authorized_keys.sh" \
"${SOURCE_DIR}/src/backuptask.js" \ "${SOURCE_DIR}/src/backupupload.js" \
"${SOURCE_DIR}/src/scripts/configurelogrotate.sh") "${SOURCE_DIR}/src/scripts/configurelogrotate.sh")
for script in "${scripts[@]}"; do for script in "${scripts[@]}"; do