diff --git a/backend/internal/nginx.js b/backend/internal/nginx.js index d0882ccc..5f802c00 100644 --- a/backend/internal/nginx.js +++ b/backend/internal/nginx.js @@ -185,7 +185,7 @@ const internalNginx = { // Prevent modifying the original object: let host = JSON.parse(JSON.stringify(host_row)); const nice_host_type = internalNginx.getFileFriendlyHostType(host_type); - + if (config.debug()) { logger.info('Generating ' + nice_host_type + ' Config:', JSON.stringify(host, null, 2)); } diff --git a/backend/migrations/20241209062244_ssl_key_type.js b/backend/migrations/20241209062244_ssl_key_type.js index 7fcd107d..647b2c71 100644 --- a/backend/migrations/20241209062244_ssl_key_type.js +++ b/backend/migrations/20241209062244_ssl_key_type.js @@ -16,6 +16,12 @@ exports.up = function (knex) { return knex.schema.alterTable('proxy_host', (table) => { table.enum('ssl_key_type', ['ecdsa', 'rsa']).defaultTo('ecdsa').notNullable(); + }).then(() => { + logger.info(`[${migrate_name}] Column 'ssl_key_type' added to table 'proxy_host'`); + + return knex.schema.alterTable('certificate', (table) => { + table.enum('ssl_key_type', ['ecdsa', 'rsa']).defaultTo('ecdsa').notNullable(); + }); }).then(() => { logger.info(`[${migrate_name}] Column 'ssl_key_type' added to table 'proxy_host'`); }); @@ -33,6 +39,12 @@ exports.down = function (knex) { return knex.schema.alterTable('proxy_host', (table) => { table.dropColumn('ssl_key_type'); + }).then(() => { + logger.info(`[${migrate_name}] Column 'ssl_key_type' removed from table 'proxy_host'`); + + return knex.schema.alterTable('certificate', (table) => { + table.dropColumn('ssl_key_type'); + }); }).then(() => { logger.info(`[${migrate_name}] Column 'ssl_key_type' removed from table 'proxy_host'`); }); diff --git a/backend/migrations/20241211081223_ssl_key_type_in_proxy.js b/backend/migrations/20241211081223_ssl_key_type_in_proxy.js deleted file mode 100644 index a7e72b92..00000000 --- a/backend/migrations/20241211081223_ssl_key_type_in_proxy.js +++ /dev/null @@ -1,39 +0,0 @@ -const migrate_name = 'identifier_for_migrate'; -const logger = require('../logger').migrate; - -/** - * Migrate - * - * @see http://knexjs.org/#Schema - * - * @param {Object} knex - * @param {Promise} Promise - * @returns {Promise} - */ -exports.up = function (knex) { - - logger.info(`[${migrate_name}] Migrating Up...`); - - return knex.schema.alterTable('certificate', (table) => { - table.enum('ssl_key_type', ['ecdsa', 'rsa']).defaultTo('ecdsa').notNullable(); - }).then(() => { - logger.info(`[${migrate_name}] Column 'ssl_key_type' added to table 'proxy_host'`); - }); -}; - -/** - * Undo Migrate - * - * @param {Object} knex - * @param {Promise} Promise - * @returns {Promise} - */ -exports.down = function (knex) { - logger.info(`[${migrate_name}] Migrating Down...`); - - return knex.schema.alterTable('certificate', (table) => { - table.dropColumn('ssl_key_type'); - }).then(() => { - logger.info(`[${migrate_name}] Column 'ssl_key_type' removed from table 'proxy_host'`); - }); -}; diff --git a/backend/migrations/20241221201400_default_server.js b/backend/migrations/20241221201400_default_server.js index 6c6939a2..177f03b2 100644 --- a/backend/migrations/20241221201400_default_server.js +++ b/backend/migrations/20241221201400_default_server.js @@ -1,4 +1,4 @@ -const migrate_name = 'identifier_for_migrate'; +const migrate_name = 'default_server'; const logger = require('../logger').migrate; /** diff --git a/backend/schema/components/proxy-host-object.json b/backend/schema/components/proxy-host-object.json index 55164922..ad90e854 100644 --- a/backend/schema/components/proxy-host-object.json +++ b/backend/schema/components/proxy-host-object.json @@ -23,7 +23,6 @@ "locations", "hsts_enabled", "hsts_subdomains", - "ssl_key_type", "default_server", "certificate" ], diff --git a/frontend/js/app/nginx/proxy/form.ejs b/frontend/js/app/nginx/proxy/form.ejs index 09996692..ba37a734 100644 --- a/frontend/js/app/nginx/proxy/form.ejs +++ b/frontend/js/app/nginx/proxy/form.ejs @@ -114,7 +114,7 @@ -
+