Skip to content

Commit

Permalink
JE-69776 [JPS] Update the acme.sh version used in LE jps (if it is po… (
Browse files Browse the repository at this point in the history
jelastic-jps#288)

* JE-69776 [JPS] Update the acme.sh version used in LE jps (if it is possible)

* Update manifest.jps

---------

Co-authored-by: Slava Katiukha <v.katiukha@gmail.com>
  • Loading branch information
DmytroZubelevych and SlavaKatiukha authored Apr 15, 2024
1 parent abfffa9 commit 0260452
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion configs/vers.yaml
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,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

0 comments on commit 0260452

Please sign in to comment.