underpost 2.99.5 → 2.99.6

package/README.md

@@ -18,7 +18,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.ci.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.99.5)](https://socket.dev/npm/package/underpost/overview/2.99.5) [![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.ci.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.99.6)](https://socket.dev/npm/package/underpost/overview/2.99.6) [![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 -->
 
@@ -66,7 +66,7 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.99.5
+## underpost ci/cd cli v2.99.6
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -93,7 +93,7 @@ Commands:
   install                                                    Quickly imports Underpost npm dependencies by copying them.
   db [options] [deploy-list]                                 Manages database operations with support for MariaDB and MongoDB, including import/export, multi-pod targeting, and Git integration.
   metadata [options] [deploy-id] [host] [path]               Manages cluster metadata operations, including import and export.
-  cron [options] [deploy-list] [job-list]                    Manages cron jobs, including initialization, execution, and configuration updates.
+  cron [options] [deploy-list] [job-list]                    Manages cron jobs: execute jobs directly or generate and apply K8s CronJob manifests.
   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.

package/baremetal/commission-workflows.json

@@ -6,7 +6,7 @@
     "isoUrl": "https://cdimage.ubuntu.com/releases/24.04/release/ubuntu-24.04.3-live-server-arm64.iso",
     "tftpPrefix": "rpi4mb",
     "bootstrapHttpServerPort": 8888,
-    "menuentryStr": "UNDERPOST.NET UEFI/GRUB/MAAS RPi4 ISO-RAM commissioning (ARM64)",
+    "menuentryStr": "UNDERPOST.NET UEFI/GRUB/MAAS RPi4 ISO-RAM Ubuntu 24.04 ephemeral commissioning (ARM64)",
     "networkInterfaceName": "enabcm6e4ei0",
     "chronyc": {
       "timezone": "America/Santiago",
@@ -35,7 +35,7 @@
     "architecture": "arm64",
     "tftpPrefix": "rpi4mb",
     "bootstrapHttpServerPort": 8888,
-    "menuentryStr": "UNDERPOST.NET UEFI/GRUB/MAAS RPi4 CHROOT commissioning (ARM64)",
+    "menuentryStr": "UNDERPOST.NET UEFI/GRUB/MAAS RPi4 CHROOT Ubuntu 24.04 ephemeral commissioning (ARM64)",
     "networkInterfaceName": "enabcm6e4ei0",
     "firmwares": [
       {
@@ -71,7 +71,7 @@
     "isoUrl": "https://cdimage.ubuntu.com/releases/24.04/release/ubuntu-24.04.3-live-server-arm64.iso",
     "tftpPrefix": "rpi4mb",
     "bootstrapHttpServerPort": 8888,
-    "menuentryStr": "UNDERPOST.NET UEFI/GRUB/MAAS RPi4 ISO-NFS commissioning (ARM64)",
+    "menuentryStr": "UNDERPOST.NET UEFI/GRUB/MAAS RPi4 ISO-NFS Ubuntu 24.04 ephemeral commissioning (ARM64)",
     "networkInterfaceName": "enabcm6e4ei0",
     "chronyc": {
       "timezone": "America/Santiago",
@@ -100,7 +100,7 @@
     "architecture": "arm64",
     "tftpPrefix": "rpi4mb",
     "bootstrapHttpServerPort": 8888,
-    "menuentryStr": "UNDERPOST.NET Rocky9 Container CHROOT NFS (ARM64)",
+    "menuentryStr": "UNDERPOST.NET Container CHROOT Rocky Linux 9 ephemeral commissioning (ARM64)",
     "networkInterfaceName": "eth0",
     "firmwares": [
       {
@@ -129,7 +129,7 @@
     "isoUrl": "https://releases.ubuntu.com/releases/24.04/ubuntu-24.04.3-live-server-amd64.iso",
     "tftpPrefix": "envy",
     "bootstrapHttpServerPort": 8888,
-    "menuentryStr": "UNDERPOST.NET UEFI/ISO-IPXE/MAAS hp-envy ISO-NFS commissioning (AMD64)",
+    "menuentryStr": "UNDERPOST.NET UEFI/ISO-IPXE/MAAS hp-envy ISO-NFS Ubuntu 24.04 ephemeral commissioning (AMD64)",
     "networkInterfaceName": "eth0",
     "chronyc": {
       "timezone": "America/Santiago",
@@ -153,7 +153,7 @@
     "isoUrl": "https://releases.ubuntu.com/releases/24.04/ubuntu-24.04.3-live-server-amd64.iso",
     "tftpPrefix": "envy",
     "bootstrapHttpServerPort": 8888,
-    "menuentryStr": "UNDERPOST.NET UEFI/ISO-IPXE/MAAS hp-envy ISO-RAM commissioning (AMD64)",
+    "menuentryStr": "UNDERPOST.NET UEFI/ISO-IPXE/MAAS hp-envy ISO-RAM Ubuntu 24.04 ephemeral commissioning (AMD64)",
     "networkInterfaceName": "eth0",
     "chronyc": {
       "timezone": "America/Santiago",
@@ -169,5 +169,42 @@
     "keyboard": {
       "layout": "es"
     }
+  },
+  "hp-envy-iso-ram-rocky9": {
+    "type": "iso-ram",
+    "osIdLike": "rhel centos fedora",
+    "architecture": "amd64",
+    "isoUrl": "https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9-latest-x86_64-boot.iso",
+    "tftpPrefix": "envy-rocky9",
+    "bootstrapHttpServerPort": 8888,
+    "menuentryStr": "UNDERPOST.NET UEFI/ISO-IPXE/KICKSTART-ANACONDA hp-envy ISO-RAM Rocky Linux 9 ephemeral commissioning (AMD64)",
+    "networkInterfaceName": "eth0",
+    "chronyc": {
+      "timezone": "America/Santiago",
+      "chronyConfPath": "/etc/chrony/chrony.conf"
+    },
+    "firmwares": [],
+    "container": {
+      "image": "quay.io/rockylinux/rockylinux:9",
+      "architecture": "amd64",
+      "packages": [
+        "kernel",
+        "kernel-core",
+        "kernel-modules",
+        "linux-firmware",
+        "dracut",
+        "dracut-network",
+        "dracut-config-generic",
+        "dracut-live",
+        "nfs-utils",
+        "tar",
+        "iproute",
+        "openssh-server",
+        "openssh-clients"
+      ]
+    },
+    "keyboard": {
+      "layout": "es"
+    }
   }
 }

package/bin/deploy.js

@@ -468,6 +468,9 @@ 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 cron --cmd 'cd /home/dd/engine && node bin run secret && node bin env dd-cron production' --git --kubeadm --dev --setup-start`,
+      );
       shellExec(`node bin/deploy build-envs`);
       break;
     }

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.99.5
+## underpost ci/cd cli v2.99.6
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -25,7 +25,7 @@ Commands:
   install                                                    Quickly imports Underpost npm dependencies by copying them.
   db [options] [deploy-list]                                 Manages database operations with support for MariaDB and MongoDB, including import/export, multi-pod targeting, and Git integration.
   metadata [options] [deploy-id] [host] [path]               Manages cluster metadata operations, including import and export.
-  cron [options] [deploy-list] [job-list]                    Manages cron jobs, including initialization, execution, and configuration updates.
+  cron [options] [deploy-list] [job-list]                    Manages cron jobs: execute jobs directly or generate and apply K8s CronJob manifests.
   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.
@@ -255,6 +255,8 @@ Options:
   --lang <lang>                HTML lang attribute (default: en).
   --dir <dir>                  HTML dir attribute (default: ltr).
   --dev                        Sets the development cli context
+  --run-sv [port]              Start a standalone Express static server to
+                               preview the static build (default port: 5000).
   -h, --help                   display help for command
  
 ```
@@ -630,22 +632,39 @@ Options:
 ```
  Usage: underpost cron [options] [deploy-list] [job-list]
 
-Manages cron jobs, including initialization, execution, and configuration
-updates.
+Manages cron jobs: execute jobs directly or generate and apply K8s CronJob
+manifests.
 
 Arguments:
-  deploy-list               A comma-separated list of deployment IDs (e.g.,
-                            "default-a,default-b").
-  job-list                  A comma-separated list of job IDs. Options:
-                            dns,backup. Defaults to all available jobs.
+  deploy-list                A comma-separated list of deployment IDs (e.g.,
+                             "default-a,default-b").
+  job-list                   A comma-separated list of job IDs. Options:
+                             dns,backup. Defaults to all available jobs.
 
 Options:
-  --init-pm2-cronjobs       Initializes PM2 cron jobs from configuration for
-                            the specified deployment IDs.
-  --git                     Uploads cron job configurations to GitHub.
-  --update-package-scripts  Updates package.json start scripts for each
-                            deploy-id configuration.
-  -h, --help                display help for command
+  --generate-k8s-cronjobs    Generates Kubernetes CronJob YAML manifests from
+                             cron configuration.
+  --apply                    Applies generated K8s CronJob manifests to the
+                             cluster via kubectl.
+  --setup-start [deploy-id]  Updates deploy-id package.json start script and
+                             generates+applies its K8s CronJob manifests.
+  --namespace <namespace>    Kubernetes namespace for the CronJob resources
+                             (default: "default").
+  --image <image>            Custom container image for the CronJob pods.
+  --git                      Pass --git flag to cron job execution.
+  --cmd <cmd>                Optional pre-script commands to run before cron
+                             execution.
+  --dev                      Use local ./ base path instead of global underpost
+                             installation.
+  --k3s                      Use k3s cluster context (apply directly on host).
+  --kind                     Use kind cluster context (apply via kind-worker
+                             container).
+  --kubeadm                  Use kubeadm cluster context (apply directly on
+                             host).
+  --dry-run                  Preview cron jobs without executing them.
+  --create-job-now           After applying manifests, immediately create a Job
+                             from each CronJob (requires --apply).
+  -h, --help                 display help for command
  
 ```
   
@@ -834,7 +853,8 @@ Options:
   --expose                                        Enables service exposure for the runner execution.
   --conf-server-path <conf-server-path>           Sets a custom configuration server path.
   --underpost-root <underpost-root>               Sets a custom Underpost root path.
-  --cron-jobs <jobs>                              Comma-separated list of cron jobs to run before executing the script.
+  --cmd-cron-jobs <cmd-cron-jobs>                 Pre-script commands to run before cron job execution.
+  --deploy-id-cron-jobs <deploy-id-cron-jobs>     Specifies deployment IDs to synchronize cron jobs with during execution.
   --timezone <timezone>                           Sets the timezone for the runner execution.
   --kubeadm                                       Sets the kubeadm cluster context for the runner execution.
   --k3s                                           Sets the k3s cluster context for the runner execution.
@@ -855,6 +875,8 @@ Options:
   --monitor-status-kind-type <kind-type>          Sets the Kubernetes resource kind type to monitor (default: "pods").
   --monitor-status-delta-ms <milliseconds>        Sets the polling interval in milliseconds for status monitoring (default: 1000).
   --monitor-status-max-attempts <attempts>        Sets the maximum number of status check attempts (default: 600).
+  --dry-run                                       Preview operations without executing them.
+  --create-job-now                                After applying cron manifests, immediately create a Job from each CronJob (forwarded to cron runner).
   -h, --help                                      display help for command
  
 ```
@@ -943,11 +965,13 @@ Options:
   --remove-machines <system-ids>                Removes baremetal machines by comma-separated system IDs, or use "all"
   --clear-discovered                            Clears all discovered baremetal machines from the database.
   --commission                                  Init workflow for commissioning a physical machine.
+  --bootstrap-http-server-run                   Runs a temporary bootstrap HTTP server for generic purposes such as serving iPXE scripts or ISO images during commissioning.
   --bootstrap-http-server-path <path>           Sets a custom bootstrap HTTP server path for baremetal commissioning.
   --bootstrap-http-server-port <port>           Sets a custom bootstrap HTTP server port for baremetal commissioning.
   --iso-url <url>                               Uses a custom ISO URL for baremetal machine commissioning.
   --nfs-build                                   Builds an NFS root filesystem for a workflow id config architecture using QEMU emulation.
   --nfs-mount                                   Mounts the NFS root filesystem for a workflow id config architecture.
+  --nfs-reset                                   Resets the NFS server completely, closing all connections before reloading exports.
   --nfs-unmount                                 Unmounts the NFS root filesystem for a workflow id config architecture.
   --nfs-build-server                            Builds the NFS server for a workflow id config architecture.
   --nfs-sh                                      Copies QEMU emulation root entrypoint shell command to the clipboard.

package/examples/static-page/README.md

@@ -26,6 +26,30 @@ underpost static --generate-config ./static-config.json
 underpost static --config-file ./examples/static-page/static-config-example.json
 ```
 
+## Preview with Static Server
+
+Use `--run-sv` to start a standalone Express static file server that serves the build output directory, so you can preview your generated pages in a browser.
+
+```sh
+# Build and serve on default port 5000:
+underpost static --page ./examples/static-page/ssr-components/CustomPage.js \
+                 --output-path ./dist/index.html \
+                 --run-sv
+
+# Build and serve on a custom port:
+underpost static --page ./examples/static-page/ssr-components/CustomPage.js \
+                 --output-path ./dist/index.html \
+                 --run-sv 3000
+
+# Serve an existing build directory without rebuilding:
+underpost static --output-path ./dist/index.html --run-sv
+
+# Serve the current working directory:
+underpost static --run-sv 8080
+```
+
+When `--output-path` is provided, the server serves the directory containing the output file (e.g. `./dist/`). Otherwise it serves the current working directory.
+
 ## Config File Reference
 
 See [`static-config-example.json`](./static-config-example.json) for a complete working example.
@@ -34,6 +58,7 @@ See [`static-config-example.json`](./static-config-example.json) for a complete
 |-------|------|-------------|
 | `page` | `string` | Path to the SSR component to render |
 | `outputPath` | `string` | Output HTML file path |
+| `buildPath` | `string` | Base path for static documents or assets (default: `"/"`) |
 | `env` | `string` | `"production"` or `"development"` |
 | `minify` | `boolean` | Minify HTML output |
 | `lang` | `string` | HTML `lang` attribute |
@@ -51,20 +76,62 @@ See [`static-config-example.json`](./static-config-example.json) for a complete
 
 Flags override config file values when both are provided.
 
+### Build & Output
+
+```sh
+underpost static --page <path>                  # SSR component path
+                 --output-path <path>           # Output file
+                 --build-path <path>            # Base path for assets (default: "/")
+                 --config-file <path>           # JSON config file
+                 --generate-config [path]       # Generate a template config file
+                 --env <env>                    # production | development
+                 --minify / --no-minify         # Toggle minification
+                 --lang <lang>                  # HTML lang attribute (default: en)
+                 --dir <dir>                    # HTML dir attribute (default: ltr)
+                 --dev                          # Development mode
+```
+
+### Metadata & SEO
+
+```sh
+                 --title <title>                # Page title (deprecated: use --config-file)
+                 --description <text>           # Meta description
+                 --keywords <a,b,c>             # Comma-separated keywords
+                 --author <name>                # Meta author
+                 --theme-color <color>          # Theme color for mobile browsers
+                 --canonical-url <url>          # Canonical URL for SEO
+                 --thumbnail <url>              # Open Graph thumbnail image URL
+                 --locale <locale>              # Page locale (default: en-US)
+                 --site-name <name>             # Site name for Open Graph
+```
+
+### Scripts & Styles
+
+```sh
+                 --head-scripts <paths>         # Comma-separated script paths for <head>
+                 --body-scripts <paths>         # Comma-separated script paths for <body>
+                 --styles <paths>               # Comma-separated stylesheet paths
+```
+
+### Icons
+
+```sh
+                 --favicon <path>               # Favicon path
+                 --apple-touch-icon <path>      # Apple touch icon path
+                 --manifest <path>              # Web manifest path
+```
+
+### SSR Components
+
+```sh
+                 --head-components <paths>      # Comma-separated SSR head component paths
+                 --body-components <paths>      # Comma-separated SSR body component paths
+```
+
+### Static Server
+
 ```sh
-underpost static --page <path>            # SSR component path
-                 --output-path <path>     # Output file
-                 --config-file <path>     # JSON config file
-                 --env <env>              # production | development
-                 --minify / --no-minify   # Toggle minification
-                 --title <title>          # Page title
-                 --description <text>     # Meta description
-                 --keywords <a,b,c>       # Comma-separated keywords
-                 --author <name>          # Meta author
-                 --favicon <path>         # Favicon path
-                 --lang <lang>            # HTML lang attribute
-                 --dir <dir>              # HTML dir attribute
-                 --dev                    # Development mode
+                 --run-sv [port]                # Start Express static server (default port: 5000)
 ```
 
 ## SSR Component

package/manifests/cronjobs/dd-cron/dd-cron-backup.yaml

@@ -0,0 +1,40 @@
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: dd-cron-backup
+  namespace: default
+  labels:
+    app: dd-cron-backup
+    managed-by: underpost
+spec:
+  schedule: "0 1 * * *"
+  concurrencyPolicy: Forbid
+  startingDeadlineSeconds: 200
+  successfulJobsHistoryLimit: 3
+  failedJobsHistoryLimit: 1
+  suspend: false
+  jobTemplate:
+    spec:
+      template:
+        metadata:
+          labels:
+            app: dd-cron-backup
+            managed-by: underpost
+        spec:
+          containers:
+            - name: dd-cron-backup
+              image: underpost/underpost-engine:v2.99.6
+              command:
+                - /bin/sh
+                - -c
+                - >
+                  cd /home/dd/engine && node bin run secret && node bin env dd-cron production && node bin cron --git --dev dd-lampp,dd-cyberia,dd-core,dd-test backup
+              volumeMounts:
+                - mountPath: /home/dd/engine
+                  name: underpost-cron-container-volume
+          volumes:
+            - hostPath:
+                path: /home/dd/engine
+                type: Directory
+              name: underpost-cron-container-volume
+          restartPolicy: OnFailure

package/manifests/cronjobs/dd-cron/dd-cron-dns.yaml

@@ -0,0 +1,40 @@
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: dd-cron-dns
+  namespace: default
+  labels:
+    app: dd-cron-dns
+    managed-by: underpost
+spec:
+  schedule: "* * * * *"
+  concurrencyPolicy: Forbid
+  startingDeadlineSeconds: 200
+  successfulJobsHistoryLimit: 3
+  failedJobsHistoryLimit: 1
+  suspend: false
+  jobTemplate:
+    spec:
+      template:
+        metadata:
+          labels:
+            app: dd-cron-dns
+            managed-by: underpost
+        spec:
+          containers:
+            - name: dd-cron-dns
+              image: underpost/underpost-engine:v2.99.6
+              command:
+                - /bin/sh
+                - -c
+                - >
+                  cd /home/dd/engine && node bin run secret && node bin env dd-cron production && node bin cron --git --dev dd-cron dns
+              volumeMounts:
+                - mountPath: /home/dd/engine
+                  name: underpost-cron-container-volume
+          volumes:
+            - hostPath:
+                path: /home/dd/engine
+                type: Directory
+              name: underpost-cron-container-volume
+          restartPolicy: OnFailure

package/manifests/deployment/dd-default-development/deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: dd-default-development-blue
-          image: localhost/rockylinux9-underpost:v2.99.5
+          image: localhost/rockylinux9-underpost:v2.99.6
           #          resources:
           #            requests:
           #              memory: "124Ki"
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: dd-default-development-green
-          image: localhost/rockylinux9-underpost:v2.99.5
+          image: localhost/rockylinux9-underpost:v2.99.6
           #          resources:
           #            requests:
           #              memory: "124Ki"

package/manifests/deployment/dd-test-development/deployment.yaml

@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
         - name: dd-test-development-blue
-          image: localhost/rockylinux9-underpost:v2.99.5
+          image: localhost/rockylinux9-underpost:v2.99.6
 
           command:
             - /bin/sh
@@ -103,7 +103,7 @@ spec:
     spec:
       containers:
         - name: dd-test-development-green
-          image: localhost/rockylinux9-underpost:v2.99.5
+          image: localhost/rockylinux9-underpost:v2.99.6
 
           command:
             - /bin/sh

package/package.json

@@ -2,13 +2,12 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.99.5",
+    "version": "2.99.6",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",
         "build": "node bin/deploy build-full-client",
         "test": "env-cmd -f .env.test c8 mocha",
-        "pm2": "env-cmd -f .env.production pm2 start src/server.js --node-args=\"--max-old-space-size=8192\" --name engine -- dd-default",
         "dev": "env-cmd -f .env.development nodemon src/server",
         "dev-img": "env-cmd -f .env.development node src/server",
         "prod-img": "env-cmd -f .env.production node src/server",
@@ -16,7 +15,7 @@
         "dev-client": "env-cmd -f .env.development node src/client.dev",
         "dev-proxy": "env-cmd -f .env.development node src/proxy proxy",
         "docs": "jsdoc -c jsdoc.json",
-        "install-global": "npm install -g pm2 && npm install -g jsdoc && npm install -g prettier && npm install -g env-cmd",
+        "install-global": "npm install -g jsdoc && npm install -g prettier && npm install -g env-cmd",
         "install-test": "npm install -g mocha && npm install -g c8 && npm install -g coveralls",
         "install-underpost": "cp -a $(npm root -g)/underpost/node_modules ./node_modules && npm install --only=dev --ignore-scripts",
         "install": "npm run install-global && npm run install-test",

package/scripts/maas-setup.sh

@@ -93,12 +93,16 @@ echo "MAAS setup script completed with new configurations."
 
 
 
-echo "Configuring DHCP for fabric-1 (untagged VLAN)..."
+echo "Configuring DHCP for the subnet's fabric (untagged VLAN)..."
 
-# Get the FABRIC_ID for "fabric-1"
+# Derive FABRIC_ID and VLAN_VID from the subnet that matches our CIDR
 SUBNET_CIDR="192.168.1.0/24"
-SUBNET_ID=$(maas "$MAAS_ADMIN_USERNAME" subnets read | jq -r '.[] | select(.cidr == "'"$SUBNET_CIDR"'") | .id')
-FABRIC_ID=$(maas "$MAAS_ADMIN_USERNAME" fabrics read | jq -r '.[] | select(.name == "fabric-1") | .id')
+SUBNET_JSON=$(maas "$MAAS_ADMIN_USERNAME" subnets read | jq -r '.[] | select(.cidr == "'"$SUBNET_CIDR"'")')
+SUBNET_ID=$(echo "$SUBNET_JSON" | jq -r '.id')
+FABRIC_ID=$(echo "$SUBNET_JSON" | jq -r '.vlan.fabric_id')
+VLAN_VID=$(echo "$SUBNET_JSON" | jq -r '.vlan.vid')
+FABRIC_NAME=$(echo "$SUBNET_JSON" | jq -r '.vlan.fabric')
+echo "Detected subnet $SUBNET_CIDR on $FABRIC_NAME (fabric ID: $FABRIC_ID, VLAN VID: $VLAN_VID)"
 RACK_CONTROLLER_ID=$(maas "$MAAS_ADMIN_USERNAME" rack-controllers read | jq -r '[.[] | select(.ip_addresses[] == "'"$IP_ADDRESS"'") | .system_id] | .[0]')
 
 if [ -z "$RACK_CONTROLLER_ID" ] || [ "$RACK_CONTROLLER_ID" == "null" ]; then
@@ -114,8 +118,8 @@ fi
 START_IP="192.168.1.191"
 END_IP="192.168.1.254"
 
-if [ -z "$FABRIC_ID" ]; then
-    echo "Error: Could not find FABRIC_ID for 'fabric-1'. Please ensure 'fabric-1' exists in MAAS."
+if [ -z "$FABRIC_ID" ] || [ "$FABRIC_ID" == "null" ]; then
+    echo "Error: Could not find FABRIC_ID for subnet '$SUBNET_CIDR'. Please ensure the subnet exists in MAAS."
     exit 1
 fi
 
@@ -123,9 +127,9 @@ fi
 echo "Creating dynamic IP range from $START_IP to $END_IP..."
 maas "$MAAS_ADMIN_USERNAME" ipranges create type=dynamic start_ip="$START_IP" end_ip="$END_IP" || echo "Dynamic IP range likely already exists or conflicts. Proceeding..."
 
-# Enable DHCP on the untagged VLAN (VLAN tag 0)
-echo "Enabling DHCP on VLAN 0 for fabric-1 (ID: $FABRIC_ID)..."
-maas "$MAAS_ADMIN_USERNAME" vlan update "$FABRIC_ID" 0 dhcp_on=true primary_rack="$RACK_CONTROLLER_ID"
+# Enable DHCP on the VLAN associated with the subnet
+echo "Enabling DHCP on VLAN $VLAN_VID for $FABRIC_NAME (fabric ID: $FABRIC_ID)..."
+maas "$MAAS_ADMIN_USERNAME" vlan update "$FABRIC_ID" "$VLAN_VID" dhcp_on=true primary_rack="$RACK_CONTROLLER_ID"
 
 echo "Setting gateway IP for subnet $SUBNET_CIDR (ID: $SUBNET_ID) to $IP_ADDRESS..."
 maas "$MAAS_ADMIN_USERNAME" subnet update $SUBNET_ID gateway_ip=$IP_ADDRESS