From cf0e4d80611a0c077ba11fc4abc94edd3a969a30 Mon Sep 17 00:00:00 2001
From: John Livingston <git@john-livingston.fr>
Date: Thu, 13 Apr 2023 18:41:23 +0200
Subject: [PATCH] Fix settings read.

---
 server/lib/prosody/config.ts | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/server/lib/prosody/config.ts b/server/lib/prosody/config.ts
index 01f9d46e..8677fb45 100644
--- a/server/lib/prosody/config.ts
+++ b/server/lib/prosody/config.ts
@@ -64,22 +64,26 @@ async function getProsodyFilePaths (options: RegisterServerOptions): Promise<Pro
 
   let certsDir: string | undefined = path.resolve(dir, 'certs')
   let certsDirIsCustom = false
-  if ((settings['prosody-certificates-dir'] as string ?? '') !== '') {
-    if (!fs.statSync(settings['prosody-certificates-dir'] as string).isDirectory()) {
-      // We can throw an exception here...
-      // Because if the user input a wrong directory, the plugin will not register,
-      // and he will never be able to fix the conf
-      logger.error('Certificate directory does not exist or is not a directory')
-      certsDir = undefined
+  if (settings['prosody-room-allow-s2s']) {
+    if ((settings['prosody-certificates-dir'] as string ?? '') !== '') {
+      if (!fs.statSync(settings['prosody-certificates-dir'] as string).isDirectory()) {
+        // We can throw an exception here...
+        // Because if the user input a wrong directory, the plugin will not register,
+        // and he will never be able to fix the conf
+        logger.error('Certificate directory does not exist or is not a directory')
+        certsDir = undefined
+      } else {
+        certsDir = settings['prosody-certificates-dir'] as string
+      }
+      certsDirIsCustom = true
     } else {
-      certsDir = settings['prosody-certificates-dir'] as string
+      // In this case we are generating and using self signed certificates
+
+      // Note: when using prosodyctl to generate self-signed certificates,
+      // there are wrongly generated in the data dir.
+      // So we will use this dir as the certs dir.
+      certsDir = path.resolve(dir, 'data')
     }
-    certsDirIsCustom = true
-  } else if (settings['prosody-room-allow-s2s']) {
-    // Note: when using prosodyctl to generate self-signed certificates,
-    // there are wrongly generated in the data dir.
-    // So we will use this dir as the certs dir.
-    certsDir = path.resolve(dir, 'data')
   }
 
   return {