Skip to content

regexp fixes #301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

regexp fixes #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
77113a1
add space after replacing
lazarenkoalexey Jun 29, 2024
6bfe3e5
small regexp fixes
lazarenkoalexey Jun 29, 2024
012d5a5
Update generate-ssl-cert.sh
lazarenkoalexey Jun 29, 2024
19ec07c
fixes in regexp
lazarenkoalexey Jun 29, 2024
76528b2
Merge branch 'jelastic-jps:master' into master
lazarenkoalexey Nov 16, 2024
d6611c1
Update manifest.jps
lazarenkoalexey Nov 16, 2024
bad7ddf
Update ssl-manager.js
lazarenkoalexey Nov 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions manifest.jps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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}

Expand All @@ -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
2 changes: 1 addition & 1 deletion scripts/generate-ssl-cert.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/ssl-manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down