underpost 2.8.878 → 2.8.881

package/.env.development

@@ -1,13 +1,45 @@
 DEPLOY_ID=dd-default
-DEFAULT_DEPLOY_ID=dd-default
 NODE_ENV=development
 PORT=4000
 JWT_SECRET=test
 REFRESH_EXPIRE_MINUTES=5
 ACCESS_EXPIRE_MINUTES=1440
 NODE_OPTIONS=--max-old-space-size=8192
-BASE_API=api
+TIME_ZONE=changethis
+GITHUB_TOKEN=changethis
+GITHUB_USERNAME=changethis
+GITHUB_BACKUP_REPO=changethis
+GITHUB_DNS_REPO=changethis
+DEFAULT_DEPLOY_ID=dd-default
 DEFAULT_DEPLOY_HOST=default.net
 DEFAULT_DEPLOY_PATH=/
+MARIADB_HOST=changethis
+MARIADB_USER=changethis
+MARIADB_PASSWORD=changethis
+DD_LAMPP_TEST_DB_0=changethis
+WIFI=changethis
+ROUTER=changethis
+CLOUDINARY_CLOUD_NAME=changethis
+CLOUDINARY_API_KEY=changethis
+CLOUDINARY_API_SECRET=changethis
+DB_PG_MAAS_NAME=changethis
+DB_PG_MAAS_PASS=changethis
+DB_PG_MAAS_USER=changethis
+DB_PG_MAAS_HOST=127.0.0.1
+DB_PG_MAAS_PORT=5432
+MAAS_ADMIN_USERNAME=changethis
+MAAS_API_KEY=changethis
+MAAS_ADMIN_EMAIL=admin@default.net
+MAAS_ADMIN_PASS=changethis
+TFTP_ROOT=changethis
+NETMASK=255.255.255.0
+RPI4_INTERFACE_NAME=changethis
+RPI4_IP=192.168.1.192
+MAAS_DNS=8.8.8.8
+MAAS_NTP_SERVER=changethis
+NFS_EXPORT_PATH=changethis
+RPI4_MAC_ADDRESS=changethis
+NVIDIA_API_KEY=changethis
 DEFAULT_ADMIN_EMAIL=admin@default.net
-DEFAULT_ADMIN_PASSWORD=changethis
+DEFAULT_ADMIN_PASSWORD=changethis
+BASE_API=api

package/.env.production

@@ -1,13 +1,50 @@
 DEPLOY_ID=dd-default
-DEFAULT_DEPLOY_ID=dd-default
 NODE_ENV=production
 PORT=3000
 JWT_SECRET=test
 REFRESH_EXPIRE_MINUTES=5
 ACCESS_EXPIRE_MINUTES=1440
 NODE_OPTIONS=--max-old-space-size=8192
-BASE_API=api
+TIME_ZONE=changethis
+GITHUB_TOKEN=changethis
+GITHUB_USERNAME=changethis
+GITHUB_BACKUP_REPO=changethis
+GITHUB_DNS_REPO=changethis
+DEFAULT_DEPLOY_ID=dd-default
 DEFAULT_DEPLOY_HOST=default.net
 DEFAULT_DEPLOY_PATH=/
+MARIADB_HOST=changethis
+MARIADB_USER=changethis
+MARIADB_PASSWORD=changethis
+DD_LAMPP_TEST_DB_0=changethis
+WIFI=changethis
+ROUTER=changethis
+CLOUDINARY_CLOUD_NAME=changethis
+CLOUDINARY_API_KEY=changethis
+CLOUDINARY_API_SECRET=changethis
+DB_PG_MAAS_NAME=changethis
+DB_PG_MAAS_PASS=changethis
+DB_PG_MAAS_USER=changethis
+DB_PG_MAAS_HOST=127.0.0.1
+DB_PG_MAAS_PORT=5432
+MAAS_ADMIN_USERNAME=changethis
+MAAS_API_KEY=changethis
+MAAS_ADMIN_EMAIL=admin@default.net
+MAAS_ADMIN_PASS=changethis
+TFTP_ROOT=changethis
+NETMASK=255.255.255.0
+RPI4_INTERFACE_NAME=changethis
+RPI4_IP=192.168.1.192
+MAAS_DNS=8.8.8.8
+MAAS_NTP_SERVER=changethis
+NFS_EXPORT_PATH=changethis
+RPI4_MAC_ADDRESS=changethis
+NVIDIA_API_KEY=changethis
 DEFAULT_ADMIN_EMAIL=admin@default.net
-DEFAULT_ADMIN_PASSWORD=changethis
+DEFAULT_ADMIN_PASSWORD=changethis
+DEFAULT_SSH_USER=changethis
+DEFAULT_SSH_HOST=changethis
+DEFAULT_SSH_KEY_PATH=changethis
+BASE_API=api
+CERTBOT_LIVE_PATH=changethis
+CERTBOT_LIVE_PATH_WINDOWS=changethis

package/.env.test

@@ -1,13 +1,45 @@
 DEPLOY_ID=dd-default
-DEFAULT_DEPLOY_ID=dd-default
 NODE_ENV=test
 PORT=5000
 JWT_SECRET=test
 REFRESH_EXPIRE_MINUTES=5
 ACCESS_EXPIRE_MINUTES=1440
 NODE_OPTIONS=--max-old-space-size=8192
-BASE_API=api
+TIME_ZONE=changethis
+GITHUB_TOKEN=changethis
+GITHUB_USERNAME=changethis
+GITHUB_BACKUP_REPO=changethis
+GITHUB_DNS_REPO=changethis
+DEFAULT_DEPLOY_ID=dd-default
 DEFAULT_DEPLOY_HOST=default.net
 DEFAULT_DEPLOY_PATH=/
+MARIADB_HOST=changethis
+MARIADB_USER=changethis
+MARIADB_PASSWORD=changethis
+DD_LAMPP_TEST_DB_0=changethis
+WIFI=changethis
+ROUTER=changethis
+CLOUDINARY_CLOUD_NAME=changethis
+CLOUDINARY_API_KEY=changethis
+CLOUDINARY_API_SECRET=changethis
+DB_PG_MAAS_NAME=changethis
+DB_PG_MAAS_PASS=changethis
+DB_PG_MAAS_USER=changethis
+DB_PG_MAAS_HOST=127.0.0.1
+DB_PG_MAAS_PORT=5432
+MAAS_ADMIN_USERNAME=changethis
+MAAS_API_KEY=changethis
+MAAS_ADMIN_EMAIL=admin@default.net
+MAAS_ADMIN_PASS=changethis
+TFTP_ROOT=changethis
+NETMASK=255.255.255.0
+RPI4_INTERFACE_NAME=changethis
+RPI4_IP=192.168.1.192
+MAAS_DNS=8.8.8.8
+MAAS_NTP_SERVER=changethis
+NFS_EXPORT_PATH=changethis
+RPI4_MAC_ADDRESS=changethis
+NVIDIA_API_KEY=changethis
 DEFAULT_ADMIN_EMAIL=admin@default.net
-DEFAULT_ADMIN_PASSWORD=changethis
+DEFAULT_ADMIN_PASSWORD=changethis
+BASE_API=api

package/.github/workflows/release.cd.yml

@@ -31,7 +31,8 @@ jobs:
             cd /home/dd/engine
             npm install -g underpost
             underpost run secret
-            node bin run --dev pull
+            underpost run pull
             underpost run secret
+            underpost cmt . --empty ci docker-image-engine
             underpost run underpost-config
             underpost run ssh-deploy engine-test

package/README.md

@@ -55,6 +55,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -63,7 +67,7 @@
 <!-- badges -->
 
 
-[![Node.js CI](https://github.com/underpostnet/engine/actions/workflows/docker-image.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml) [![Test](https://github.com/underpostnet/engine/actions/workflows/coverall.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/coverall.yml) [![Downloads](https://img.shields.io/npm/dm/underpost.svg)](https://www.npmjs.com/package/underpost) [![Socket Badge](https://socket.dev/api/badge/npm/package/underpost/2.8.878)](https://socket.dev/npm/package/underpost/overview/2.8.878) [![Coverage Status](https://coveralls.io/repos/github/underpostnet/engine/badge.svg?branch=master)](https://coveralls.io/github/underpostnet/engine?branch=master) [![Version](https://img.shields.io/npm/v/underpost.svg)](https://www.npmjs.org/package/underpost) [![License](https://img.shields.io/npm/l/underpost.svg)](https://www.npmjs.com/package/underpost)
+[![Node.js CI](https://github.com/underpostnet/engine/actions/workflows/docker-image.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml) [![Test](https://github.com/underpostnet/engine/actions/workflows/coverall.ci.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/coverall.yml) [![Downloads](https://img.shields.io/npm/dm/underpost.svg)](https://www.npmjs.com/package/underpost) [![Socket Badge](https://socket.dev/api/badge/npm/package/underpost/2.8.881)](https://socket.dev/npm/package/underpost/overview/2.8.881) [![Coverage Status](https://coveralls.io/repos/github/underpostnet/engine/badge.svg?branch=master)](https://coveralls.io/github/underpostnet/engine?branch=master) [![Version](https://img.shields.io/npm/v/underpost.svg)](https://www.npmjs.org/package/underpost) [![License](https://img.shields.io/npm/l/underpost.svg)](https://www.npmjs.com/package/underpost)
 
 
 <!-- end-badges -->
@@ -107,6 +111,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -156,44 +164,44 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.8.878
+## underpost ci/cd cli v2.8.881
 
 ### Usage: `underpost [options] [command]`
-  ```
- Options:
-  -V, --version                                              output the version number
-  -h, --help                                                 display help for command
+
+```
+Options:
+-V, --version                                              output the version number
+-h, --help                                                 display help for command
 
 Commands:
-  new [options] <app-name>                                   Initializes a new Underpost project with a predefined structure.
-  start [options] <deploy-id> [env]                          Initiates application servers, build pipelines, or other defined services based on the deployment ID.
-  clone [options] <uri>                                      Clones a specified GitHub repository into the current directory.
-  pull [options] <path> <uri>                                Pulls the latest changes from a specified GitHub repository.
-  cmt [options] <path> <commit-type> [module-tag] [message]  Manages commits to a GitHub repository, supporting various commit types and options.
-  push [options] <path> <uri>                                Pushes committed changes from a local repository to a remote GitHub repository.
-  env <deploy-id> [env]                                      Sets environment variables and configurations related to a specific deployment ID.
-  config [options] <operator> [key] [value]                  Manages Underpost configurations using various operators.
-  root                                                       Displays the root path of the npm installation.
-  cluster [options] [pod-name]                               Manages Kubernetes clusters, defaulting to Kind cluster initialization.
-  deploy [options] [deploy-list] [env]                       Manages application deployments, defaulting to deploying development pods.
-  secret [options] <platform>                                Manages secrets for various platforms.
-  dockerfile-image-build [options]                           Builds a Docker image from a specified Dockerfile with various options for naming, saving, and loading.
-  dockerfile-pull-base-images [options]                      Pulls required Underpost Dockerfile base images and optionally loads them into clusters.
-  install                                                    Quickly imports Underpost npm dependencies by copying them.
-  db [options] <deploy-list>                                 Manages database operations, including import, export, and collection management.
-  metadata [options] [deploy-id] [host] [path]               Manages cluster metadata operations, including import and export.
-  script [options] <operator> <script-name> [script-value]   Supports a variety of built-in Underpost global scripts, their preset lifecycle events, and arbitrary custom scripts.
-  cron [options] [deploy-list] [job-list]                    Manages cron jobs, including initialization, execution, and configuration updates.
-  fs [options] [path]                                        Manages file storage, defaulting to file upload operations.
-  test [options] [deploy-list]                               Manages and runs tests, defaulting to the current Underpost default test suite.
-  monitor [options] <deploy-id> [env]                        Manages health server monitoring for specified deployments.
-  ssh [options]                                              Import and start ssh server and client based on current default deployment ID.
-  run [options] <runner-id> [path]                           Runs a script from the specified path.
-  lxd [options]                                              Manages LXD containers and virtual machines.
-  baremetal [options] [workflow-id] [hostname] [ip-address]  Manages baremetal server operations, including installation, database setup, commissioning, and user management.
-  help [command]                                             display help for command
- 
+new [options] <app-name>                                   Initializes a new Underpost project with a predefined structure.
+start [options] <deploy-id> [env]                          Initiates application servers, build pipelines, or other defined services based on the deployment ID.
+clone [options] <uri>                                      Clones a specified GitHub repository into the current directory.
+pull [options] <path> <uri>                                Pulls the latest changes from a specified GitHub repository.
+cmt [options] <path> <commit-type> [module-tag] [message]  Manages commits to a GitHub repository, supporting various commit types and options.
+push [options] <path> <uri>                                Pushes committed changes from a local repository to a remote GitHub repository.
+env <deploy-id> [env]                                      Sets environment variables and configurations related to a specific deployment ID.
+config [options] <operator> [key] [value]                  Manages Underpost configurations using various operators.
+root                                                       Displays the root path of the npm installation.
+cluster [options] [pod-name]                               Manages Kubernetes clusters, defaulting to Kind cluster initialization.
+deploy [options] [deploy-list] [env]                       Manages application deployments, defaulting to deploying development pods.
+secret [options] <platform>                                Manages secrets for various platforms.
+dockerfile-image-build [options]                           Builds a Docker image from a specified Dockerfile with various options for naming, saving, and loading.
+dockerfile-pull-base-images [options]                      Pulls required Underpost Dockerfile base images and optionally loads them into clusters.
+install                                                    Quickly imports Underpost npm dependencies by copying them.
+db [options] <deploy-list>                                 Manages database operations, including import, export, and collection management.
+metadata [options] [deploy-id] [host] [path]               Manages cluster metadata operations, including import and export.
+script [options] <operator> <script-name> [script-value]   Supports a variety of built-in Underpost global scripts, their preset lifecycle events, and arbitrary custom scripts.
+cron [options] [deploy-list] [job-list]                    Manages cron jobs, including initialization, execution, and configuration updates.
+fs [options] [path]                                        Manages file storage, defaulting to file upload operations.
+test [options] [deploy-list]                               Manages and runs tests, defaulting to the current Underpost default test suite.
+monitor [options] <deploy-id> [env]                        Manages health server monitoring for specified deployments.
+ssh [options]                                              Import and start ssh server and client based on current default deployment ID.
+run [options] <runner-id> [path]                           Runs a script from the specified path.
+lxd [options]                                              Manages LXD containers and virtual machines.
+baremetal [options] [workflow-id] [hostname] [ip-address]  Manages baremetal server operations, including installation, database setup, commissioning, and user management.
+help [command]                                             display help for command
+
 ```
-      
+
 <a target="_top" href="https://github.com/underpostnet/pwa-microservices-template/blob/master/cli.md">See complete CLI Docs here.</a>
-      

package/bin/deploy.js

@@ -469,6 +469,7 @@ try {
       shellExec(`node bin new --deploy-id dd-default`);
       console.log(fs.existsSync(`./engine-private/conf/dd-default`));
       shellExec(`sudo rm -rf ./engine-private/conf/dd-default`);
+      shellExec(`node bin/deploy build-env`);
       break;
     }
 
@@ -535,6 +536,45 @@ ${shellExec(`git log | grep Author: | sort -u`, { stdout: true }).split(`\n`).jo
 
       break;
     }
+    case 'build-env': {
+      const buildEnv = (privateEnvPath, originEnv, env) => {
+        const privateEnv = dotenv.parse(fs.readFileSync(privateEnvPath, 'utf8'));
+        for (const key of Object.keys(privateEnv)) {
+          if (key in env) {
+            console.warn(`Key ${key} already exists in origin env`);
+            continue;
+          }
+          if (key in originEnv) {
+            console.warn(`Key ${key} already exists in origin env`);
+            env[key] = originEnv[key];
+            continue;
+          }
+          env[key] =
+            `${key}`.toUpperCase().match('API') ||
+            `${key}`.toUpperCase().match('KEY') ||
+            `${key}`.toUpperCase().match('SECRET') ||
+            `${key}`.toUpperCase().match('TOKEN') ||
+            `${key}`.toUpperCase().match('PASSWORD') ||
+            `${key}`.toUpperCase().match('MAC')
+              ? 'changethis'
+              : isNaN(parseFloat(privateEnv[key]))
+              ? `${privateEnv[key]}`.match(`@`)
+                ? 'admin@default.net'
+                : 'changethis'
+              : privateEnv[key];
+        }
+        return env;
+      };
+      for (let envPath of ['.env.development', '.env.production', '.env.test']) {
+        const originEnv = dotenv.parse(fs.readFileSync(`./${envPath}`, 'utf8'));
+
+        let env = {};
+        env = buildEnv(`./engine-private/conf/dd-cron/${envPath}`, originEnv, env);
+        env = buildEnv(`./engine-private/conf/dd-core/${envPath}`, originEnv, env);
+        writeEnv(envPath, env);
+      }
+      break;
+    }
 
     case 'update-default-conf': {
       const defaultServer = DefaultConf.server['default.net']['/'];