cyberia 3.1.3 → 3.2.5

package/.env.example

@@ -68,7 +68,5 @@ POSTMAN_PASSWORD=changethis
 DEFAULT_SSH_PORT=22
 ENABLE_FILE_LOGS=false
 BASE_API=api
-CERTBOT_LIVE_PATH=changethis
-CERTBOT_LIVE_PATH_WINDOWS=changethis
 DEV_PROXY_PORT_OFFSET=200
 DOTENV_CONFIG_QUIET=true

package/.github/workflows/engine-cyberia.cd.yml

@@ -47,7 +47,7 @@ jobs:
             set -e
             echo "Starting remote deploy"
             cd /home/dd/engine
-            sudo -n -- /bin/bash -lc "underpost run pull"
+            sudo -n -- /bin/bash -lc "node bin run pull"
             sudo -n -- /bin/bash -lc "npm install"
             sudo -n -- /bin/bash -lc "node bin run deploy dd-cyberia"
   sync-and-deploy:
@@ -80,12 +80,14 @@ jobs:
             set -e
             echo "Starting remote sync and deploy"
             cd /home/dd/engine
-            sudo -n -- /bin/bash -lc "underpost run pull"
+            sudo -n -- /bin/bash -lc "node bin run pull"
             sudo -n -- /bin/bash -lc "npm install"
-            sudo -n -- /bin/bash -lc "underpost fs src/client/public/cyberia --git --pull --recursive --deploy-id dd-cyberia"
-            sudo -n -- /bin/bash -lc "underpost fs src/client/public/underpost --git --pull --recursive --deploy-id dd-cyberia --storage-file-path './engine-private/conf/dd-cyberia/storage.underpost.json'"
+            sudo -n -- /bin/bash -lc "node bin run clean src/client/public/cyberia"
+            sudo -n -- /bin/bash -lc "node bin fs src/client/public/cyberia --git --pull --recursive --deploy-id dd-cyberia"
+            sudo -n -- /bin/bash -lc "node bin run clean src/client/public/underpost"
+            sudo -n -- /bin/bash -lc "node bin fs src/client/public/underpost --git --pull --recursive --deploy-id dd-cyberia --storage-file-path './engine-private/conf/dd-cyberia/storage.underpost.json'"
             sudo -n -- /bin/bash -lc "npm run test"
-            sudo -n -- /bin/bash -lc "node bin run sync --kubeadm --deploy-id-cron-jobs none --timeout-response 300000ms dd-cyberia,1,,localhost/rockylinux9-underpost:v2.98.3 --cmd 'npm install -g npm@11.2.0,npm install -g underpost,underpost secret underpost --create-from-file /etc/config/.env.production,underpost start --build --run dd-cyberia production'"
+            sudo -n -- /bin/bash -lc "node bin run sync --kubeadm --deploy-id-cron-jobs none --timeout-response 300000ms dd-cyberia,1,,localhost/rockylinux9-underpost:v2.98.3 --cmd 'npm install -g npm@11.2.0,npm install -g underpost,underpost secret underpost --create-from-env,underpost start --build --run dd-cyberia production'"
   init:
     if: >-
       github.repository == 'underpostnet/engine'
@@ -116,8 +118,8 @@ jobs:
             set -e
             echo "Starting init deploy"
             cd /home/dd/engine
-            sudo -n -- /bin/bash -lc "underpost run pull"
+            sudo -n -- /bin/bash -lc "node bin run pull"
             sudo -n -- /bin/bash -lc "npm install"
-            sudo -n -- /bin/bash -lc "node bin deploy dd-cyberia production --kubeadm --sync --build-manifest --image 'localhost/rockylinux9-underpost:v2.98.3' --timeout-response 300000ms --versions green --replicas 1 --cmd 'npm install -g npm@11.2.0,npm install -g underpost,underpost secret underpost --create-from-file /etc/config/.env.production,underpost start --build --run dd-cyberia production'"
-            sudo -n -- /bin/bash -lc "node bin deploy dd-cyberia production --kubeadm --disable-update-proxy"
+            sudo -n -- /bin/bash -lc "node bin deploy dd-cyberia production --kubeadm --sync --build-manifest --image 'localhost/rockylinux9-underpost:v2.98.3' --timeout-response 300000ms --versions green --replicas 1 --cmd 'npm install -g npm@11.2.0,npm install -g underpost,underpost secret underpost --create-from-env,underpost start --build --run dd-cyberia production'"
+            sudo -n -- /bin/bash -lc "node bin deploy dd-cyberia production --kubeadm --disable-update-proxy --git-clean"
             sudo -n -- /bin/bash -lc "node bin monitor dd-cyberia production --ready-deployment --promote --timeout-response 300000ms --versions green --replicas 1"

package/.github/workflows/engine-cyberia.ci.yml

@@ -1,9 +1,5 @@
 name: CI | Engine cyberia | github repository
 on:
-  workflow_run:
-    workflows: ['CI | Publish npm repository package']
-    types:
-      - completed
   workflow_dispatch:
     inputs:
       sync:
@@ -32,7 +28,6 @@ permissions:
   id-token: write
 jobs:
   pwa-microservices-template:
-    if: github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success'
     name: Update github repo package Jobs
     runs-on: ubuntu-latest
     container:
@@ -55,10 +50,7 @@ jobs:
           dnf install nodejs -y
 
       - name: Install dependencies
-        run: |
-          npm install -g underpost
-          npm install
-          underpost config set GITHUB_TOKEN ${{ secrets.GIT_AUTH_TOKEN }}
+        run: npm install
 
       - name: Set git global credentials
         run: |
@@ -67,33 +59,24 @@ jobs:
           git config --global user.email 'development@underpost.net'
 
       - name: Build repository
+        env:
+          GITHUB_TOKEN: ${{ secrets.GIT_AUTH_TOKEN }}
         run: |
-          cd .. && underpost clone underpostnet/pwa-microservices-template
-          FULL_MSG=$(cd pwa-microservices-template && git log -1 --pretty=%B 2>/dev/null || echo "")
-          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
-            if [ -n "${{ github.event.inputs.message }}" ]; then
-              LAST_COMMIT_MESSAGE="${{ github.event.inputs.message }}"
-            else
-              LAST_COMMIT_MESSAGE=$(echo "$FULL_MSG" | sed '1s/^[^:]*: [^ ]* //' | grep -v '^\[cd:' || true)
-            fi
-            SHOULD_CD="${{ github.event.inputs.sync }}"
-            DEPLOY_TYPE="${{ github.event.inputs.deploy_type }}"
+          cd .. && node engine/bin clone underpostnet/pwa-microservices-template
+          if [ -n "${{ github.event.inputs.message }}" ]; then
+            LAST_COMMIT_MESSAGE="${{ github.event.inputs.message }}"
           else
-            LAST_COMMIT_MESSAGE=$(echo "$FULL_MSG" | sed '1s/^[^:]*: [^ ]* //' | grep -v '^\[cd:' || true)
-            CD_MARKER=$(echo "$FULL_MSG" | grep '^\[cd:engine-cyberia:' | head -1 || true)
-            if [ -n "$CD_MARKER" ]; then
-              SHOULD_CD="true"
-              DEPLOY_TYPE=$(echo "$CD_MARKER" | sed 's/\[cd:engine-cyberia:\(.*\)\]/\1/')
-            else
-              SHOULD_CD="false"
-            fi
+            FULL_MSG=$(cd pwa-microservices-template && git log -1 --pretty=%B 2>/dev/null || echo "")
+            LAST_COMMIT_MESSAGE=$(echo "$FULL_MSG" | sed '1s/^[^:]*: [^ ]* //')
           fi
+          SHOULD_CD="${{ github.event.inputs.sync }}"
+          DEPLOY_TYPE="${{ github.event.inputs.deploy_type }}"
           if [ -z "$LAST_COMMIT_MESSAGE" ]; then
             LAST_COMMIT_MESSAGE="Update engine cyberia repository"
           fi
           echo "[INFO] Captured commit message: $LAST_COMMIT_MESSAGE"
           echo "[INFO] Should CD: $SHOULD_CD, Deploy type: $DEPLOY_TYPE"
-          underpost clone --bare underpostnet/engine-cyberia
+          node engine/bin clone --bare underpostnet/engine-cyberia
           cd engine
           node bin/build dd-cyberia development
           cd ../pwa-microservices-template
@@ -104,7 +87,7 @@ jobs:
           git config user.email 'development@underpost.net'
           git add .
           git commit -m "$LAST_COMMIT_MESSAGE"
-          underpost push . underpostnet/engine-cyberia
+          node ../engine/bin push . underpostnet/engine-cyberia
           if [ "$SHOULD_CD" = "true" ]; then
             if [ -z "$DEPLOY_TYPE" ]; then
               DEPLOY_TYPE="sync-and-deploy"

package/.github/workflows/ghpkg.ci.yml

@@ -43,8 +43,6 @@ jobs:
 
       - name: Install dependencies and set repo configuration
         run: |
-          npm install -g underpost
-          underpost config set GITHUB_TOKEN ${{ secrets.GIT_AUTH_TOKEN }}
           npm install
           node ./bin/deploy rename-package @underpostnet/underpost
           node ./bin/deploy set-repo underpostnet/pwa-microservices-template-ghpkg
@@ -57,8 +55,10 @@ jobs:
           git config --global user.email 'fcoverdugoa@underpost.net'
 
       - name: Clone and Push to github package repository
+        env:
+          GITHUB_TOKEN: ${{ secrets.GIT_AUTH_TOKEN }}
         run: |
-          underpost clone --bare underpostnet/pwa-microservices-template-ghpkg
+          node bin clone --bare underpostnet/pwa-microservices-template-ghpkg
           rm -rf ./.git
           mv ./pwa-microservices-template-ghpkg.git ./.git
           pwd
@@ -69,4 +69,4 @@ jobs:
           git add .
           git status
           git commit -m "$LAST_COMMIT_MESSAGE"
-          underpost push . underpostnet/pwa-microservices-template-ghpkg
+          node bin push . underpostnet/pwa-microservices-template-ghpkg

package/.github/workflows/npmpkg.ci.yml

@@ -69,10 +69,7 @@ jobs:
           echo "[INFO] Extracted payload: $LAST_COMMIT_MESSAGE"
 
       - name: Install dependencies
-        run: |
-          npm install -g underpost
-          underpost config set GITHUB_TOKEN ${{ secrets.GIT_AUTH_TOKEN }}
-          npm install
+        run: npm install
 
       - name: Set git global credentials
         run: |
@@ -82,8 +79,10 @@ jobs:
           git config --global user.email 'fcoverdugoa@underpost.net'
 
       - name: Clone github package repository
+        env:
+          GITHUB_TOKEN: ${{ secrets.GIT_AUTH_TOKEN }}
         run: |
-          cd .. && underpost clone underpostnet/pwa-microservices-template
+          cd .. && node engine/bin clone underpostnet/pwa-microservices-template
           cd engine
           npm run update:template
           cd ../pwa-microservices-template
@@ -91,11 +90,29 @@ jobs:
           git add .
           git config user.name 'underpostnet'
           git config user.email 'fcoverdugoa@underpost.net'
-          COMMIT_MSG="$LAST_COMMIT_MESSAGE"
+          node ../engine/bin cmt . ci package-pwa-microservices-template-ghpkg "$LAST_COMMIT_MESSAGE"
+          node ../engine/bin push . underpostnet/pwa-microservices-template
+
+      - name: Dispatch all engine CIs
+        run: |
           DEPLOY_CONF_ID="${{ github.event.inputs.deploy_conf_id }}"
           DEPLOY_TYPE="${{ github.event.inputs.deploy_type }}"
-          if [ -n "$DEPLOY_CONF_ID" ] && [ -n "$DEPLOY_TYPE" ]; then
-            COMMIT_MSG=$(printf '%s\n[cd:%s:%s]' "$COMMIT_MSG" "$DEPLOY_CONF_ID" "$DEPLOY_TYPE")
-          fi
-          underpost cmt . ci package-pwa-microservices-template-ghpkg "$COMMIT_MSG"
-          underpost push . underpostnet/pwa-microservices-template
+          for ENGINE in engine-core engine-cyberia engine-lampp engine-test; do
+            SYNC="false"
+            DT=""
+            if [ "$ENGINE" = "$DEPLOY_CONF_ID" ]; then
+              SYNC="true"
+              DT="$DEPLOY_TYPE"
+            fi
+            echo "[INFO] Dispatching ${ENGINE}.ci.yml (sync=$SYNC, deploy_type=$DT)"
+            INPUTS="{\"sync\":\"${SYNC}\""
+            if [ -n "$DT" ]; then
+              INPUTS="${INPUTS},\"deploy_type\":\"${DT}\""
+            fi
+            INPUTS="${INPUTS}}"
+            curl -s -X POST \
+              -H "Accept: application/vnd.github.v3+json" \
+              -H "Authorization: token ${{ secrets.GIT_AUTH_TOKEN }}" \
+              "https://api.github.com/repos/underpostnet/engine/actions/workflows/${ENGINE}.ci.yml/dispatches" \
+              -d "{\"ref\":\"master\",\"inputs\":${INPUTS}}"
+          done

package/.github/workflows/publish.ci.yml

@@ -3,17 +3,27 @@ on:
   push:
     tags:
       - 'v*'
+permissions:
+  contents: write
+  packages: write
+  id-token: write
 jobs:
   build-and-publish:
     # prevents this action from running on forks
     if: github.repository == 'underpostnet/pwa-microservices-template'
     runs-on: ubuntu-latest
     permissions:
-      contents: read
+      contents: write
+      packages: write
       id-token: write
     steps:
       - uses: actions/checkout@v6
 
+      - name: Install required packages
+        run: |
+          sudo apt-get update -y
+          sudo apt-get install -y sudo tar gzip bzip2 git curl
+
       - uses: actions/setup-node@v6
         with:
           node-version: '24.x'
@@ -27,12 +37,21 @@ jobs:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: npm publish --provenance --access public
 
+      - name: Dispatch release CD
+        run: |
+          curl -s -f -X POST \
+            -H "Accept: application/vnd.github.v3+json" \
+            -H "Authorization: token ${{ secrets.GIT_AUTH_TOKEN }}" \
+            "https://api.github.com/repos/underpostnet/pwa-microservices-template/actions/workflows/release.cd.yml/dispatches" \
+            -d '{"ref":"master"}'
+
   build-and-publish-ghpkg:
     # prevents this action from running on forks
     if: github.repository == 'underpostnet/pwa-microservices-template-ghpkg'
     runs-on: ubuntu-latest
     permissions:
-      contents: read
+      contents: write
+      packages: write
       id-token: write
     steps:
       - uses: actions/checkout@v6

package/.github/workflows/pwa-microservices-template-page.cd.yml

@@ -51,23 +51,22 @@ jobs:
 
       - name: Build the site
         run: |
-          npm install -g underpost
           npm install
           node bin new --default-conf --conf-workflow-id dd-github-pages
           node bin new --deploy-id dd-github-pages
-          underpost env dd-github-pages production
+          node bin env dd-github-pages production
           NODE_ENV=production node bin client dd-github-pages '' underpostnet.github.io /pwa-microservices-template-ghpkg
       # git lfs install
       # git lfs track
       # git lfs ls-files
       # git lfs pull
       - name: Setup Pages
-        uses: actions/configure-pages@v5
+        uses: actions/configure-pages@v6
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v4
+        uses: actions/upload-pages-artifact@v5
         with:
           # Upload entire repository
           path: './public/underpostnet.github.io/pwa-microservices-template-ghpkg/'
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v5

package/.github/workflows/pwa-microservices-template-test.ci.yml

@@ -26,8 +26,8 @@ jobs:
       - name: Get npm root
         run: npm root -g
 
-      - name: Install underpost CLI
-        run: npm install -g underpost
+      - name: Install dependencies
+        run: npm install
 
       - name: Run test
-        run: underpost test
+        run: node bin test

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

@@ -1,14 +1,19 @@
 name: CD | Release deployment | remote ssh
 
 on:
-  workflow_run:
-    workflows: ['CI | Publish npm package']
-    types:
-      - completed
+  push:
+    branches: [main, master]
+
+  workflow_call:
+
+  workflow_dispatch:
 
 jobs:
   after-publish:
-    if: github.repository == 'underpostnet/pwa-microservices-template' || startsWith(github.event.head_commit.message, 'cd(ssh-release)')
+    if: |
+      github.event_name == 'workflow_dispatch'
+      || github.event_name == 'workflow_call'
+      || (github.event_name == 'push' && startsWith(github.event.head_commit.message, 'cd(ssh-release)'))
     runs-on: ubuntu-latest
     steps:
       - name: Run remote deploy via SSH
@@ -31,11 +36,11 @@ jobs:
             set -e
             echo "Starting remote release deploy"
             cd /home/dd/engine
-            sudo -n -- /bin/bash -lc "underpost run pull"
+            sudo -n -- /bin/bash -lc "node bin run pull"
             sudo -n -- /bin/bash -lc "npm install"
-            sudo -n -- /bin/bash -lc "underpost run secret"
+            sudo -n -- /bin/bash -lc "node bin run secret"
             sudo -n -- /bin/bash -lc "npm install -g underpost"
-            sudo -n -- /bin/bash -lc "underpost run secret"
+            sudo -n -- /bin/bash -lc "node bin run secret"
             sudo -n -- /bin/bash -lc "node bin run --dev git-conf"
             sudo -n -- /bin/bash -lc "node bin run --dev template-deploy-image"
             sudo -n -- /bin/bash -lc "node bin run --dev ssh-deploy sync-engine-test"