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

Add option to allow non-admins to access SFTP

Browse Source
This commit is contained in:
Girish Ramakrishnan
2020-10-21 22:31:59 -07:00
parent cc618abf58
commit 4881d8e3a1
4 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/addons.js
View File

@@ -3,6 +3,7 @@
exports = module.exports = {
getServices,
getService,
getServicesConfig,
configureService,
getServiceLogs,
restartService,
@@ -416,11 +417,9 @@ function getService(id, callback) {
if (error) return callback(error);
const serviceConfig = servicesConfig[name];
tmp.config = Object.assign({}, serviceConfig);
if (serviceConfig && serviceConfig.memory && serviceConfig.memorySwap) {
tmp.config.memory = serviceConfig.memory;
tmp.config.memorySwap = serviceConfig.memorySwap;
} else if (service.defaultMemoryLimit) {
if ((!tmp.config.memory || !tmp.config.memorySwap) && service.defaultMemoryLimit) {
tmp.config.memory = service.defaultMemoryLimit;
tmp.config.memorySwap = tmp.config.memory * 2;
}
@@ -450,10 +449,10 @@ function configureService(id, data, callback) {
// if not specified we clear the entry and use defaults
if (!data.memory || !data.memorySwap) {
delete servicesConfig[name];
delete servicesConfig[name].memory;
delete servicesConfig[name].memorySwap;
} else {
servicesConfig[name].memory = data.memory;
servicesConfig[name].memorySwap = data.memorySwap;
servicesConfig[name] = data;
}
if (instance) {