From 0b95426ac71d2c56aeca6a8c17c09d0809247c9e Mon Sep 17 00:00:00 2001
From: Wildan M <willnode@wellosoft.net>
Date: Sat, 23 Nov 2024 09:02:10 +0700
Subject: [PATCH] Use new versioning, fix hashed pw

---
 package-lock.json          | 4 ++--
 package.json               | 2 +-
 src/binaries/metadata.json | 6 +++---
 src/executor/runner.js     | 4 +++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ab2139c..24c95b4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "domcloud-bridge",
-  "version": "0.69.0",
+  "version": "1.0.241123",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "domcloud-bridge",
-      "version": "0.69.0",
+      "version": "1.0.241123",
       "license": "MIT",
       "dependencies": {
         "cli": "^1.0.1",
diff --git a/package.json b/package.json
index b474029..95b7488 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "domcloud-bridge",
-  "version": "0.69.0",
+  "version": "1.0.241123",
   "description": "Deployment runner for DOM Cloud",
   "main": "app.js",
   "engines": {
diff --git a/src/binaries/metadata.json b/src/binaries/metadata.json
index c356020..3cf8496 100644
--- a/src/binaries/metadata.json
+++ b/src/binaries/metadata.json
@@ -1,7 +1,7 @@
 {
   "x64": {
     "rubyVersionsList": [
-      "3.3.5",
+      "3.3.6",
       "3.2.6",
       "3.1.6",
       "3.0.7",
@@ -62,12 +62,12 @@
       "3.0.7": "https://github.com/ruby/ruby-builder/releases/download/toolcache/ruby-3.0.7-ubuntu-24.04.tar.gz",
       "3.1.6": "https://github.com/ruby/ruby-builder/releases/download/toolcache/ruby-3.1.6-ubuntu-24.04.tar.gz",
       "3.2.6": "https://github.com/ruby/ruby-builder/releases/download/toolcache/ruby-3.2.6-ubuntu-24.04.tar.gz",
-      "3.3.5": "https://github.com/ruby/ruby-builder/releases/download/toolcache/ruby-3.3.5-ubuntu-24.04.tar.gz"
+      "3.3.6": "https://github.com/ruby/ruby-builder/releases/download/toolcache/ruby-3.3.6-ubuntu-24.04.tar.gz"
     }
   },
   "arm64": {
     "rubyVersionsList": [
-      "3.3.5",
+      "3.3.6",
       "3.2.6",
       "3.1.6",
       "3.0.7",
diff --git a/src/executor/runner.js b/src/executor/runner.js
index 435386a..4072d18 100644
--- a/src/executor/runner.js
+++ b/src/executor/runner.js
@@ -341,10 +341,12 @@ export default async function runConfig(config, domain, writer, sandbox = false)
             if (cb) cb('', 124);
         }, maxExecutionTime).unref();
 
+        const pw = domaindata['Password for mysql'] || domaindata['Password or postgres'] || domaindata['Password'];
+
         await sshExec('unset HISTFILE TERM', false); // https://stackoverflow.com/a/9039154/3908409
         await sshExec(`export CI=true CONTINUOUS_INTEGRATION=true LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 `, false);
         await sshExec(`export PIP_PROGRESS_BAR=off BUILDKIT_PROGRESS=plain`, false);
-        await sshExec(`USERNAME='${domaindata['Username']}' PASSWORD='${domaindata['Password']}'`, false);
+        await sshExec(`USERNAME='${domaindata['Username']}' PASSWORD='${pw}'`, false);
         const firewallOn = await firewallStatus();
         if (config.subdomain) {
             await runConfigSubdomain(config, domaindata, [config.subdomain, domain].join('.'), sshExec, writeLog, virtExec, firewallOn);