cloudron 5.7.0 → 5.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "5.7.0",
+  "version": "5.8.0",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",

package/src/actions.js

@@ -609,27 +609,27 @@ async function install(localOptions, cmd) {
         }
 
         // port bindings
-        let portBindings = {};
+        let ports = {};
         if (options.portBindings) {
             // ask the user for port values if the ports are different in the app and the manifest
             if (typeof options.portBindings === 'string') {
-                portBindings = { };
+                ports = { };
                 options.portBindings.split(',').forEach(function (kv) {
                     const tmp = kv.split('=');
                     if (isNaN(parseInt(tmp[1], 10))) return; // disable the port
-                    portBindings[tmp[0]] = parseInt(tmp[1], 10);
+                    ports[tmp[0]] = parseInt(tmp[1], 10);
                 });
             } else {
-                portBindings = queryPortBindings(null /* existing app */, manifest);
+                ports = queryPortBindings(null /* existing app */, manifest);
             }
         } else { // just put in defaults
             const allPorts = _.extend({}, manifest.tcpPorts, manifest.udpPorts);
             for (const portName in allPorts) {
-                portBindings[portName] = allPorts[portName].defaultValue;
+                ports[portName] = allPorts[portName].defaultValue;
             }
         }
 
-        for (const binding in portBindings) console.log(`Port ${binding}: ${portBindings[binding]}`);
+        for (const port in ports) console.log(`Port ${port}: ${ports[port]}`);
 
         const data = {
             appStoreId: options.appstoreId || '', // note case change
@@ -639,7 +639,7 @@ async function install(localOptions, cmd) {
             domain: domainObject.domain,
             secondaryDomains,
             aliasDomains,
-            portBindings,
+            ports,
             accessRestriction: null
         };
 
@@ -711,7 +711,7 @@ async function configure(localOptions, cmd) {
             location: domainObject.subdomain, // LEGACY
             subdomain: domainObject.subdomain,
             domain: domainObject.domain,
-            portBindings: app.portBindings,
+            ports: app.portBindings,
             secondaryDomains,
             aliasDomains
         };
@@ -734,24 +734,24 @@ async function configure(localOptions, cmd) {
 
         // port bindings
         if (options.portBindings) {
-            let portBindings = app.portBindings;
+            let ports = app.portBindings;
             // ask the user for port values if the ports are different in the app and the manifest
             if (typeof options.portBindings === 'string') {
-                portBindings = {};
+                ports = {};
                 options.portBindings.split(',').forEach(function (kv) {
                     const tmp = kv.split('=');
                     if (isNaN(parseInt(tmp[1], 10))) return; // disable the port
-                    portBindings[tmp[0]] = parseInt(tmp[1], 10);
+                    ports[tmp[0]] = parseInt(tmp[1], 10);
                 });
             } else {
-                portBindings = queryPortBindings(app, app.manifest);
+                ports = queryPortBindings(app, app.manifest);
             }
 
-            for (const binding in portBindings) {
-                console.log('%s: %s', binding, portBindings[binding]);
+            for (const port in ports) {
+                console.log('%s: %s', port, ports[port]);
             }
 
-            data.portBindings = portBindings;
+            data.ports = portBindings;
         }
 
         const request = createRequest('POST', `/api/v1/apps/${app.id}/configure/location`, options);
@@ -1258,7 +1258,7 @@ async function clone(localOptions, cmd) {
 
         const location = options.location || readlineSync.question('Cloned app location: ', {});
         const secondaryDomains = await querySecondaryDomains(app, app.manifest, options);
-        const portBindings = queryPortBindings(app, app.manifest);
+        const ports = queryPortBindings(app, app.manifest);
         const backupId = options.backup;
 
         const domainObject = await selectDomain(location, options);
@@ -1268,7 +1268,7 @@ async function clone(localOptions, cmd) {
             subdomain: domainObject.subdomain,
             domain: domainObject.domain,
             secondaryDomains,
-            portBindings
+            ports
         };
         const request = createRequest('POST', `/api/v1/apps/${app.id}/clone`, options);
         const response = await request.send(data);

package/src/backup-tools.js

@@ -280,9 +280,12 @@ async function decryptDir(inDir, outDir, options) {
             }
 
             const encryptedFilePath = path.join(cur, entry.name);
+
             const { error, decryptedFilePath } = decryptFilePath(encryptedFilePath, encryption);
             if (error) throw error;
 
+            console.log(`Decrypting ${decryptedFilePath}`);
+
             const infile = path.join(inDirAbs, cur, entry.name);
             const inStream = fs.createReadStream(infile);
             fs.mkdirSync(path.dirname(path.join(outDirAbs, decryptedFilePath)), { recursive: true });