diff --git a/setup/start.sh b/setup/start.sh index 879bc004d..cf4131f81 100755 --- a/setup/start.sh +++ b/setup/start.sh @@ -76,6 +76,7 @@ mkdir -p "${PLATFORM_DATA_DIR}/collectd/collectd.conf.d" mkdir -p "${PLATFORM_DATA_DIR}/logrotate.d" mkdir -p "${PLATFORM_DATA_DIR}/acme" mkdir -p "${PLATFORM_DATA_DIR}/backup" +mkdir -p "${PLATFORM_DATA_DIR}/logs/backup" mkdir -p "${BOX_DATA_DIR}/appicons" mkdir -p "${BOX_DATA_DIR}/certs" @@ -237,7 +238,7 @@ fi echo "==> Changing ownership" chown "${USER}:${USER}" -R "${CONFIG_DIR}" -chown "${USER}:${USER}" -R "${PLATFORM_DATA_DIR}/nginx" "${PLATFORM_DATA_DIR}/collectd" "${PLATFORM_DATA_DIR}/addons" "${PLATFORM_DATA_DIR}/acme" "${PLATFORM_DATA_DIR}/backup" +chown "${USER}:${USER}" -R "${PLATFORM_DATA_DIR}/nginx" "${PLATFORM_DATA_DIR}/collectd" "${PLATFORM_DATA_DIR}/addons" "${PLATFORM_DATA_DIR}/acme" "${PLATFORM_DATA_DIR}/backup" "${PLATFORM_DATA_DIR}/logs" chown "${USER}:${USER}" "${PLATFORM_DATA_DIR}/INFRA_VERSION" 2>/dev/null || true chown "${USER}:${USER}" "${PLATFORM_DATA_DIR}" diff --git a/src/cloudron.js b/src/cloudron.js index ebcf74c20..5281bb854 100644 --- a/src/cloudron.js +++ b/src/cloudron.js @@ -366,7 +366,7 @@ function getLogs(unit, options, callback) { source: obj.SYSLOG_IDENTIFIER || '' }) + '\n'; }); - } else { // mail, mongodb, mysql, postgresql + } else { // mail, mongodb, mysql, postgresql, backup let args = [ '--lines=' + lines ]; if (follow) args.push('--follow'); args.push(path.join(paths.LOG_DIR, unit, 'app.log')); diff --git a/src/paths.js b/src/paths.js index ad0c5f655..052f15044 100644 --- a/src/paths.js +++ b/src/paths.js @@ -8,7 +8,6 @@ exports = module.exports = { CLOUDRON_DEFAULT_AVATAR_FILE: path.join(__dirname + '/../assets/avatar.png'), INFRA_VERSION_FILE: path.join(config.baseDir(), 'platformdata/INFRA_VERSION'), BACKUP_RESULT_FILE: path.join(config.baseDir(), 'platformdata/backup/result.txt'), - BACKUP_LOG_FILE: path.join(config.baseDir(), 'platformdata/backup/logs.txt'), OLD_DATA_DIR: path.join(config.baseDir(), 'data'), PLATFORM_DATA_DIR: path.join(config.baseDir(), 'platformdata'), @@ -35,5 +34,7 @@ exports = module.exports = { AUTO_PROVISION_FILE: path.join(config.baseDir(), 'configs/autoprovision.json'), - LOG_DIR: path.join(config.baseDir(), 'platformdata/logs') + LOG_DIR: path.join(config.baseDir(), 'platformdata/logs'), + // this pattern is for the cloudron logs API route to work + BACKUP_LOG_FILE: path.join(config.baseDir(), 'platformdata/logs/backup/app.log'), };