From 4a61a94ef0ac2e97e35383cc72b81b0f80086fa9 Mon Sep 17 00:00:00 2001 From: Edgard Oliveira Date: Fri, 31 Mar 2023 20:51:49 -0300 Subject: [PATCH 1/7] Adding Bunny CDN certbot plugin --- global/certbot-dns-plugins.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/global/certbot-dns-plugins.js b/global/certbot-dns-plugins.js index 8ac9ea81..9245222a 100644 --- a/global/certbot-dns-plugins.js +++ b/global/certbot-dns-plugins.js @@ -66,6 +66,16 @@ dns_azure_zone2 = example.org:/subscriptions/99800903-fb14-4992-9aff-12eaf274462 full_plugin_name: 'dns-azure', }, //####################################################// + bunny: { + display_name: 'BunnyCDN', + package_name: 'certbot-dns-bunny', + version_requirement: '~=0.0.9', + dependencies: '', + credentials: `# Bunny CDN API token +dns-bunny-credentials = `, + full_plugin_name: 'dns-bunny', + }, + //####################################################// cloudflare: { display_name: 'Cloudflare', package_name: 'certbot-dns-cloudflare', From 507d24e7ba732b74486a7a7bec1ddd025f2aa237 Mon Sep 17 00:00:00 2001 From: Edgard Oliveira Date: Sat, 1 Apr 2023 17:54:56 -0300 Subject: [PATCH 2/7] Allow ssl for mysql connections --- backend/config/default.json | 3 ++- backend/db.js | 3 ++- backend/lib/config.js | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/backend/config/default.json b/backend/config/default.json index 64ab577c..86542d47 100644 --- a/backend/config/default.json +++ b/backend/config/default.json @@ -5,6 +5,7 @@ "name": "npm", "user": "npm", "password": "npm", - "port": 3306 + "port": 3306, + "ssl": false } } diff --git a/backend/db.js b/backend/db.js index 1a8b1634..ba204521 100644 --- a/backend/db.js +++ b/backend/db.js @@ -16,7 +16,8 @@ function generateDbConfig() { user: cfg.user, password: cfg.password, database: cfg.name, - port: cfg.port + port: cfg.port, + ssl: cfg.ssl }, migrations: { tableName: 'migrations' diff --git a/backend/lib/config.js b/backend/lib/config.js index caa57fcf..9c9deffd 100644 --- a/backend/lib/config.js +++ b/backend/lib/config.js @@ -29,6 +29,7 @@ const configure = () => { const envMysqlHost = process.env.DB_MYSQL_HOST || null; const envMysqlUser = process.env.DB_MYSQL_USER || null; const envMysqlName = process.env.DB_MYSQL_NAME || null; + const envMysqlSsl = process.env.DB_MYSQL_SSL || false; if (envMysqlHost && envMysqlUser && envMysqlName) { // we have enough mysql creds to go with mysql logger.info('Using MySQL configuration'); @@ -40,6 +41,7 @@ const configure = () => { user: envMysqlUser, password: process.env.DB_MYSQL_PASSWORD, name: envMysqlName, + ssl: envMysqlSsl }, keys: getKeys(), }; From 0420ab71ea242e901e535cc11a998c848d0a48cc Mon Sep 17 00:00:00 2001 From: Edgard Oliveira Date: Mon, 3 Apr 2023 15:28:34 -0300 Subject: [PATCH 3/7] Wrong param name for Bunny CDN credential --- global/certbot-dns-plugins.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global/certbot-dns-plugins.js b/global/certbot-dns-plugins.js index 9245222a..8e9c6635 100644 --- a/global/certbot-dns-plugins.js +++ b/global/certbot-dns-plugins.js @@ -72,7 +72,7 @@ dns_azure_zone2 = example.org:/subscriptions/99800903-fb14-4992-9aff-12eaf274462 version_requirement: '~=0.0.9', dependencies: '', credentials: `# Bunny CDN API token -dns-bunny-credentials = `, +dns_bunny_api_key = `, full_plugin_name: 'dns-bunny', }, //####################################################// From 8ecc285d784bea8123ed49c0b3f378259df01678 Mon Sep 17 00:00:00 2001 From: Edgard Oliveira Date: Mon, 3 Apr 2023 15:29:05 -0300 Subject: [PATCH 4/7] Adding CA string for Mysql secure connection --- backend/lib/config.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/backend/lib/config.js b/backend/lib/config.js index 9c9deffd..a545bac1 100644 --- a/backend/lib/config.js +++ b/backend/lib/config.js @@ -29,7 +29,9 @@ const configure = () => { const envMysqlHost = process.env.DB_MYSQL_HOST || null; const envMysqlUser = process.env.DB_MYSQL_USER || null; const envMysqlName = process.env.DB_MYSQL_NAME || null; - const envMysqlSsl = process.env.DB_MYSQL_SSL || false; + const envMysqlSsl = process.env.DB_MYSQL_SSL || null; + const envMysqlSslCa = process.env.DB_MYSQL_SSL_CA || ''; + if (envMysqlHost && envMysqlUser && envMysqlName) { // we have enough mysql creds to go with mysql logger.info('Using MySQL configuration'); @@ -41,7 +43,9 @@ const configure = () => { user: envMysqlUser, password: process.env.DB_MYSQL_PASSWORD, name: envMysqlName, - ssl: envMysqlSsl + ssl: envMysqlSsl ? { + ca: envMysqlSslCa + } : null }, keys: getKeys(), }; From 16f702233a1af9cbbb60bf6d767f31381a98e36e Mon Sep 17 00:00:00 2001 From: Edgard Oliveira Date: Mon, 3 Apr 2023 15:35:12 -0300 Subject: [PATCH 5/7] Aligning assiments for CA config --- backend/lib/config.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/backend/lib/config.js b/backend/lib/config.js index a545bac1..9b04dba4 100644 --- a/backend/lib/config.js +++ b/backend/lib/config.js @@ -30,7 +30,7 @@ const configure = () => { const envMysqlUser = process.env.DB_MYSQL_USER || null; const envMysqlName = process.env.DB_MYSQL_NAME || null; const envMysqlSsl = process.env.DB_MYSQL_SSL || null; - const envMysqlSslCa = process.env.DB_MYSQL_SSL_CA || ''; + const envMysqlCa = process.env.DB_MYSQL_CA || null; if (envMysqlHost && envMysqlUser && envMysqlName) { // we have enough mysql creds to go with mysql @@ -43,9 +43,7 @@ const configure = () => { user: envMysqlUser, password: process.env.DB_MYSQL_PASSWORD, name: envMysqlName, - ssl: envMysqlSsl ? { - ca: envMysqlSslCa - } : null + ssl: envMysqlSsl ? { ca: envMysqlCa } : null }, keys: getKeys(), }; From d8a52607bf609fb45279a110ac6e4a3856a7d533 Mon Sep 17 00:00:00 2001 From: Edgard Oliveira Date: Tue, 4 Apr 2023 10:10:00 -0300 Subject: [PATCH 6/7] New SSL false value --- backend/lib/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/lib/config.js b/backend/lib/config.js index 9b04dba4..f91df4b7 100644 --- a/backend/lib/config.js +++ b/backend/lib/config.js @@ -43,7 +43,7 @@ const configure = () => { user: envMysqlUser, password: process.env.DB_MYSQL_PASSWORD, name: envMysqlName, - ssl: envMysqlSsl ? { ca: envMysqlCa } : null + ssl: envMysqlSsl ? { ca: envMysqlCa } : false }, keys: getKeys(), }; From 60c71a7b45ba9d55d5d9a70fcaf4432d593c81ad Mon Sep 17 00:00:00 2001 From: Edgard Oliveira Date: Tue, 4 Apr 2023 10:55:22 -0300 Subject: [PATCH 7/7] Using file path instead of CA string --- backend/lib/config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/lib/config.js b/backend/lib/config.js index f91df4b7..3f0ff77d 100644 --- a/backend/lib/config.js +++ b/backend/lib/config.js @@ -30,7 +30,7 @@ const configure = () => { const envMysqlUser = process.env.DB_MYSQL_USER || null; const envMysqlName = process.env.DB_MYSQL_NAME || null; const envMysqlSsl = process.env.DB_MYSQL_SSL || null; - const envMysqlCa = process.env.DB_MYSQL_CA || null; + const envMysqlCa = process.env.DB_MYSQL_CA || '/data/mysql-ca.crt'; if (envMysqlHost && envMysqlUser && envMysqlName) { // we have enough mysql creds to go with mysql @@ -43,7 +43,7 @@ const configure = () => { user: envMysqlUser, password: process.env.DB_MYSQL_PASSWORD, name: envMysqlName, - ssl: envMysqlSsl ? { ca: envMysqlCa } : false + ssl: envMysqlSsl ? { ca: fs.readFileSync(envMysqlCa) } : false }, keys: getKeys(), };