Fix changing SSL mode

domcloud · May 24, 2024 · 1773401 · 1773401
1 parent 95428af
commit 1773401
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "domcloud-bridge",
-  "version": "0.48.0",
+  "version": "0.48.1",
   "description": "Deployment runner for DOM Cloud",
   "main": "app.js",
   "engines": {

diff --git a/src/executor/runnersub.js b/src/executor/runnersub.js
@@ -180,8 +180,8 @@ export async function runConfigSubdomain(config, domaindata, subdomain, sshExec,
                         });
                     }
                     // if LE ON AND force self-sign / shared on, must turn off
-                    // if it was shared, just assume that's also LE ON
-                } else if ((selfSignSsl || sharedSSL) && ((subdomaindata['SSL shared with'] && changed) || subdomaindata['Lets Encrypt renewal'] == 'Enabled')) {
+                    // if it was shared or ssl path don't match, just assume that's also LE ON
+                } else if ((selfSignSsl || sharedSSL) && ((subdomaindata['SSL shared with'] && changed && !expectedSslMode) || subdomaindata['Lets Encrypt renewal'] == 'Enabled')) {
                     await writeLog("$> Generating self signed cert and turning off let's encrypt renewal");
                     await virtExec("generate-cert", {
                         domain: subdomain,