From 02604527ed3080693bc5ec899881ed1d6949f8e1 Mon Sep 17 00:00:00 2001
From: DmytroZubelevych <31444413+DmytroZubelevych@users.noreply.github.com>
Date: Mon, 15 Apr 2024 14:15:42 +0300
Subject: [PATCH] =?UTF-8?q?JE-69776=20[JPS]=20Update=20the=20acme.sh=20ver?=
 =?UTF-8?q?sion=20used=20in=20LE=20jps=20(if=20it=20is=20po=E2=80=A6=20(#2?=
 =?UTF-8?q?88)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 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>
---
 configs/vers.yaml            | 2 +-
 scripts/generate-ssl-cert.sh | 5 +++--
 scripts/install-le.sh        | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/configs/vers.yaml b/configs/vers.yaml
index aff8cfaf..5481dd9b 100644
--- a/configs/vers.yaml
+++ b/configs/vers.yaml
@@ -1,2 +1,2 @@
 globals:
-  version_acme-sh: 2.8.9
+  version_acme-sh: 3.0.7
diff --git a/scripts/generate-ssl-cert.sh b/scripts/generate-ssl-cert.sh
index 60a1500e..e064fb66 100755
--- a/scripts/generate-ssl-cert.sh
+++ b/scripts/generate-ssl-cert.sh
@@ -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
 
@@ -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$//')
diff --git a/scripts/install-le.sh b/scripts/install-le.sh
index de185519..787a6529 100755
--- a/scripts/install-le.sh
+++ b/scripts/install-le.sh
@@ -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" ] && {