Skip to content

Je 69776 #289

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
Parent: JE-70403 [Let's Encrypt] auto-update issue (#290)
wants to merge 3 commits into
base: stage
Choose a base branch
from
Open

Je 69776 #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd0b3e0
Merge pull request #287 from jelastic-jps/stage
SlavaKatiukha Dec 22, 2023
37e2058
JE-69776 [JPS] Update the acme.sh version used in LE jps (if it is po…
DmytroZubelevych Dec 26, 2023
68f8bff
Update manifest.jps
SlavaKatiukha Apr 15, 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
2 changes: 1 addition & 1 deletion configs/vers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
globals:
version_acme-sh: 2.8.9
version_acme-sh: 3.0.7
5 changes: 3 additions & 2 deletions scripts/generate-ssl-cert.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ do
[[ -z $domain ]] && break;
LOG_FILE=$DEFAULT_LOG_FILE"-"$counter

resp=$($DIR/opt/letsencrypt/acme.sh --issue $params $test_params --listen-v6 --domain $domain --nocron -f --log-level 2 --log $LOG_FILE 2>&1)
$DIR/opt/letsencrypt/acme.sh --set-default-ca --server letsencrypt
resp=$($DIR/opt/letsencrypt/acme.sh --issue $params $test_params --listen-v6 -k 2048 --domain $domain --nocron -f --log-level 2 --log $LOG_FILE 2>&1)

grep -q 'Cert success' $LOG_FILE && grep -q "BEGIN CERTIFICATE" $LOG_FILE && result_code=0 || result_code=$GENERAL_RESULT_ERROR

Expand Down Expand Up @@ -172,7 +173,7 @@ mkdir -p /tmp/
chmod -R 777 /tmp/
appdomain=$(cut -d"." -f2- <<< $appdomain)

certspath=$(sed -n 's/.*][[:space:][:digit:]{4}[:space:]]Your[[:space:]]cert[[:space:]]is[[:space:]]in[[:space:]]\{2\}\(.*\)./\1/p' $LOG_FILE)
certspath=$(sed -n 's/.*][[:space:][:digit:]{4}[:space:]]Your[[:space:]]cert[[:space:]]is[[:space:]]in[:]\{0,1\}[[:space:]]\{1,2\}\(.*\)./\0/p' $LOG_FILE|awk '{print $NF}')
certdir=$(echo $certspath | sed 's/[^\/]*\.cer$//' | tail -n 1)
certname=$(echo $certspath | sed 's/.*\///' | tail -n 1)
certdomain=$(echo $certspath | sed 's/.*\///' | sed 's/\.cer$//')
Expand Down
1 change: 1 addition & 0 deletions scripts/install-le.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ echo "Installing required packages"
}
cd $DIR/opt/letsencrypt/
./acme.sh --install --no-cron --accountemail $email
./acme.sh --set-default-ca --server letsencrypt
}

[ ! -f "${DIR}/root/validation.sh" ] && {
Expand Down