From 77113a11b807769a0da22b31634b94e6d7d7266d Mon Sep 17 00:00:00 2001 From: "alexey.lazarenko" Date: Sun, 30 Jun 2024 01:30:00 +0300 Subject: [PATCH 1/6] add space after replacing --- scripts/generate-ssl-cert.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generate-ssl-cert.sh b/scripts/generate-ssl-cert.sh index 73aa2409..93d2de6f 100755 --- a/scripts/generate-ssl-cert.sh +++ b/scripts/generate-ssl-cert.sh @@ -124,7 +124,7 @@ do all_invalid_domains_errors+=$error";" all_invalid_domains+=$invalid_domain" " - domain=$(echo $domain | sed 's/^'${invalid_domain}'\s-d\s//' | sed 's/\s-d\s'${invalid_domain}'\s-d\s//' | sed 's/\s-d\s'${invalid_domain}'$//' | sed 's/'${invalid_domain}'//') + domain=$(echo $domain | sed 's/^'${invalid_domain}'\s-d\s//' | sed 's/\s-d\s'${invalid_domain}'\s-d\s/ /' | sed 's/\s-d\s'${invalid_domain}'$//' | sed 's/'${invalid_domain}'//') } counter=$((counter + 1)) done From 6bfe3e50552d06ee45073f18954d90111759b8b2 Mon Sep 17 00:00:00 2001 From: "alexey.lazarenko" Date: Sun, 30 Jun 2024 01:55:06 +0300 Subject: [PATCH 2/6] small regexp fixes --- scripts/generate-ssl-cert.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generate-ssl-cert.sh b/scripts/generate-ssl-cert.sh index 93d2de6f..98eb00ca 100755 --- a/scripts/generate-ssl-cert.sh +++ b/scripts/generate-ssl-cert.sh @@ -124,7 +124,7 @@ do all_invalid_domains_errors+=$error";" all_invalid_domains+=$invalid_domain" " - domain=$(echo $domain | sed 's/^'${invalid_domain}'\s-d\s//' | sed 's/\s-d\s'${invalid_domain}'\s-d\s/ /' | sed 's/\s-d\s'${invalid_domain}'$//' | sed 's/'${invalid_domain}'//') + domain=$(echo $domain | sed 's/^'${invalid_domain}'\s-d\s//' | sed 's/\s-d\s'${invalid_domain}'\s-d\s/ /' | sed 's/\s-d\s'${invalid_domain}'$//' | sed s/^'${invalid_domain}'$//') } counter=$((counter + 1)) done From 012d5a5730c64d09cd1567e87267a92f42ec0b86 Mon Sep 17 00:00:00 2001 From: "alexey.lazarenko" Date: Sun, 30 Jun 2024 01:56:01 +0300 Subject: [PATCH 3/6] Update generate-ssl-cert.sh --- scripts/generate-ssl-cert.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generate-ssl-cert.sh b/scripts/generate-ssl-cert.sh index 98eb00ca..bc81509e 100755 --- a/scripts/generate-ssl-cert.sh +++ b/scripts/generate-ssl-cert.sh @@ -124,7 +124,7 @@ do all_invalid_domains_errors+=$error";" all_invalid_domains+=$invalid_domain" " - domain=$(echo $domain | sed 's/^'${invalid_domain}'\s-d\s//' | sed 's/\s-d\s'${invalid_domain}'\s-d\s/ /' | sed 's/\s-d\s'${invalid_domain}'$//' | sed s/^'${invalid_domain}'$//') + domain=$(echo $domain | sed 's/^'${invalid_domain}'\s-d\s//' | sed 's/\s-d\s'${invalid_domain}'\s-d\s/ /' | sed 's/\s-d\s'${invalid_domain}'$//' | sed 's/^'${invalid_domain}'$//') } counter=$((counter + 1)) done From 19ec07c987d11966dd447c761de806c2d3883d92 Mon Sep 17 00:00:00 2001 From: "alexey.lazarenko" Date: Sun, 30 Jun 2024 02:13:17 +0300 Subject: [PATCH 4/6] fixes in regexp --- scripts/generate-ssl-cert.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generate-ssl-cert.sh b/scripts/generate-ssl-cert.sh index bc81509e..337bb13f 100755 --- a/scripts/generate-ssl-cert.sh +++ b/scripts/generate-ssl-cert.sh @@ -124,7 +124,7 @@ do all_invalid_domains_errors+=$error";" all_invalid_domains+=$invalid_domain" " - domain=$(echo $domain | sed 's/^'${invalid_domain}'\s-d\s//' | sed 's/\s-d\s'${invalid_domain}'\s-d\s/ /' | sed 's/\s-d\s'${invalid_domain}'$//' | sed 's/^'${invalid_domain}'$//') + domain=$(echo $domain | sed 's/^'${invalid_domain}'\s-d\s//' | sed 's/\s-d\s'${invalid_domain}'\s-d\s/ -d /' | sed 's/\s-d\s'${invalid_domain}'$//' | sed 's/^'${invalid_domain}'$//') } counter=$((counter + 1)) done From d6611c18b1394c06992f31c39caa29195f69755b Mon Sep 17 00:00:00 2001 From: "alexey.lazarenko" Date: Sat, 16 Nov 2024 12:25:45 +0000 Subject: [PATCH 5/6] Update manifest.jps --- manifest.jps | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.jps b/manifest.jps index a8130b69..17655340 100644 --- a/manifest.jps +++ b/manifest.jps @@ -193,7 +193,7 @@ actions: callScript: script: | - var targetAppid = api.dev.apps.CreatePersistence ? "${globals.envAppid}" : appid; + var targetAppid = api.dev.apps.CreatePersistence ? appid : appid; var resp = api.dev.scripting.Eval(targetAppid, session, '${env.envName}-${targetNodes.nodeGroup}-${globals.scriptSufix}', {action:'${this.action}'}); if (resp.result == 0 && typeof resp.response === 'object' && resp.response.result != 0) resp = resp.response; return resp; @@ -247,7 +247,7 @@ actions: delete: script: | - var targetAppid = api.dev.apps.CreatePersistence ? "${globals.envAppid}" : appid; + var targetAppid = api.dev.apps.CreatePersistence ? appid : appid; api.dev.scripting.DeleteScript(targetAppid, session, '${env.envName}-${targetNodes.nodeGroup}-${globals.scriptSufix}'); return {result:0} @@ -269,7 +269,7 @@ actions: createScript: script: | - var targetAppid = api.dev.apps.CreatePersistence ? "${globals.envAppid}" : appid; + var targetAppid = api.dev.apps.CreatePersistence ? appid : appid; return api.dev.scripting.CreateScript(targetAppid, session, "${this.scriptName}", "js", "${this.code:}") success: /text/success.md From bad7ddffe944ba5e5b8ab650abb5eaedfec49658 Mon Sep 17 00:00:00 2001 From: "alexey.lazarenko" Date: Sat, 16 Nov 2024 12:26:26 +0000 Subject: [PATCH 6/6] Update ssl-manager.js --- scripts/ssl-manager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ssl-manager.js b/scripts/ssl-manager.js index d2bfdfa9..e866a34e 100644 --- a/scripts/ssl-manager.js +++ b/scripts/ssl-manager.js @@ -80,7 +80,7 @@ function SSLManager(config) { config = config || {}; session = config.session || ""; - targetAppid = api.dev.apps.CreatePersistence ? config.envAppid : appid; + targetAppid = api.dev.apps.CreatePersistence ? appid : appid; nodeManager = new NodeManager(config.envName, config.nodeId, config.baseDir); nodeManager.setLogPath("var/log/letsencrypt.log");