cloudron 5.2.1 → 5.3.0

package/bin/cloudron

@@ -116,6 +116,7 @@ program.command('configure')
     .option('-p, --port-bindings [PORT=port,...]', 'Query port bindings')
     .option('-l, --location <location>', 'Location')
     .option('-s, --secondary-domains [DOMAIN=domain,...]', 'Query/Set secondary domains')
+    .option('-a, --alias-domains [domain,...]', 'Alias domains')
     .action(actions.configure);
 
 program.command('debug [cmd...]')
@@ -195,7 +196,8 @@ program.command('install')
     .option('--no-wait', 'Wait for healthcheck to succeed [false]')
     .option('-p, --port-bindings [PORT=port,...]', 'Query/Set port bindings')
     .option('-l, --location <domain>', 'Subdomain or full domain')
-    .option('-s, --secondary-domains [DOMAIN=domain,...]', 'Query/Set secondary domains')
+    .option('-s, --secondary-domains [DOMAIN=domain,...]', 'Set secondary domains')
+    .option('-a, --alias-domains [domain,...]', 'Alias domains')
     .option('--appstore-id <appid[@version]>', 'Use app from the store')
     .option('--no-sso', 'Disable Cloudron SSO [false]')
     .option('--debug [cmd]', 'Enable debug mode')

package/package.json

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

package/src/actions.js

@@ -596,6 +596,13 @@ async function install(localOptions, cmd) {
 
         for (const binding in secondaryDomains) console.log(`Secondary domain ${binding}: ${secondaryDomains[binding].subdomain}.${secondaryDomains[binding].domain}`);
 
+        let aliasDomains = [];
+        if (options.aliasDomains) {
+            for (const aliasDomain of options.aliasDomains.split(',')) {
+                aliasDomains.push(await selectDomain(aliasDomain, options));
+            }
+        }
+
         // port bindings
         let portBindings = {};
         if (options.portBindings) {
@@ -626,6 +633,7 @@ async function install(localOptions, cmd) {
             subdomain: domainObject.subdomain,
             domain: domainObject.domain,
             secondaryDomains,
+            aliasDomains,
             portBindings,
             accessRestriction: null
         };
@@ -672,7 +680,7 @@ async function configure(localOptions, cmd) {
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
         if (!options.location) options.location = readlineSync.question(`Enter new location (default: ${app.fqdn}): `, { });
-        let location = options.location || app.location;
+        let location = options.location || app.subdomain;
 
         const domainObject = await selectDomain(location, options);
 
@@ -686,12 +694,21 @@ async function configure(localOptions, cmd) {
             });
         }
 
+        let aliasDomains = app.aliasDomains;
+        if (options.aliasDomains) {
+            aliasDomains = [];
+            for (const aliasDomain of options.aliasDomains.split(',')) {
+                aliasDomains.push(await selectDomain(aliasDomain, options));
+            }
+        }
+
         const data = {
             location: domainObject.subdomain, // LEGACY
             subdomain: domainObject.subdomain,
             domain: domainObject.domain,
             portBindings: app.portBindings,
-            secondaryDomains
+            secondaryDomains,
+            aliasDomains
         };
 
         // secondary domains
@@ -1370,7 +1387,7 @@ async function exec(args, localOptions, cmd) {
 
             demuxStream(socket, stdout, process.stderr); // can get separate streams in non-tty mode
             socket.on('end', function () {  // server closed the socket
-                stdin.end(); // required for this process to 'exit' cleanly. do not call exit() because writes may not have finished
+                if (typeof stdin.end === 'function') stdin.end(); // required for this process to 'exit' cleanly. do not call exit() because writes may not have finished . the type check is required for when stdin: 'ignore' in execSync, not sure why
                 if (stdout !== process.stdout) stdout.end(); // for push stream
 
                 socket.end();