fixing let's encrypt cert generation

openappsec · Apr 25, 2024 · 30badbc · 30badbc
1 parent c0d2d00
commit 30badbc
Show file tree

Hide file tree

Showing 3 changed files with 643 additions and 401 deletions.
diff --git a/backend/internal/nginx-openappsec.js b/backend/internal/nginx-openappsec.js
@@ -27,13 +27,17 @@ const internalNginxOpenappsec = {
 	 * @param   {Object} data
 	 * @returns {Promise}
 	 */
-	generateConfig: (access, row, data) => {
+	generateConfig: (access, row, d) => {
 		return access.can('settings:update', row.id)
 			.then(() => {
 				if (config.debug()) {
 					logger.info('Generating openappsec config:', JSON.stringify(data, null, 2));
 				}
 
+
+			        const data = row ? { ...row, ...d } : d;
+		                logger.debug('data', JSON.stringify(data));
+
 				const openappsecMode = data.use_openappsec == false ? 'inactive' : data.openappsec_mode;
 
 				const configTemplateFilePath = path.join(internalNginxOpenappsec.CONFIG_TEMPLATE_DIR, internalNginxOpenappsec.CONFIG_TEMPLATE_FILE_NAME)
@@ -311,4 +315,4 @@ const internalNginxOpenappsec = {
 
 };
 
-module.exports = internalNginxOpenappsec;
+module.exports = internalNginxOpenappsec;
diff --git a/backend/internal/proxy-host.js b/backend/internal/proxy-host.js
@@ -100,7 +100,7 @@ const internalProxyHost = {
 						return row;
 					})
 					.catch((err) => {
-						console.log("Error generating openappsec config: " + err);
+						console.log("Error generating openappsec config: " + err + err.stack);
 						// throw new error.ConfigurationError(err.message);
 					});
 			})
@@ -185,7 +185,7 @@ const internalProxyHost = {
 						return row;
 					})
 					.catch((err) => {
-						console.log("Error generating openappsec config: " + err);
+						console.log("Error generating openappsec config: " + err + err.stack);
 						// throw new error.ConfigurationError(err.message);
 					});
 			})