From 37e205812726b6b91924909253a38d3097c4ca2e Mon Sep 17 00:00:00 2001
From: DmytroZubelevych <31444413+DmytroZubelevych@users.noreply.github.com>
Date: Tue, 26 Dec 2023 14:49:05 +0200
Subject: [PATCH 1/2] JE-69776 [JPS] Update the acme.sh version used in LE jps
 (if it is possible)

---
 configs/vers.yaml            | 2 +-
 manifest.jps                 | 2 +-
 scripts/generate-ssl-cert.sh | 5 +++--
 scripts/install-le.sh        | 1 +
 4 files changed, 6 insertions(+), 4 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/manifest.jps b/manifest.jps
index 2e47c227..9d498ffb 100644
--- a/manifest.jps
+++ b/manifest.jps
@@ -50,7 +50,7 @@ targetNodes:
     - jenkins2
 
 homepage: https://github.com/jelastic-jps/lets-encrypt
-baseUrl: https://raw.githubusercontent.com/jelastic-jps/lets-encrypt/master
+baseUrl: https://raw.githubusercontent.com/jelastic-jps/lets-encrypt/JE-69776
 logo: images/letsencrypt.png
 
 description:
diff --git a/scripts/generate-ssl-cert.sh b/scripts/generate-ssl-cert.sh
index 4dc4744c..501e9d4f 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 d6b6c75e..57249097 100755
--- a/scripts/install-le.sh
+++ b/scripts/install-le.sh
@@ -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" ] && {

From 68f8bffaa789e3406f72c0369dc64e5775796634 Mon Sep 17 00:00:00 2001
From: Slava Katiukha <v.katiukha@gmail.com>
Date: Mon, 15 Apr 2024 13:14:31 +0200
Subject: [PATCH 2/2] Update manifest.jps

---
 manifest.jps | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.jps b/manifest.jps
index 9d498ffb..2e47c227 100644
--- a/manifest.jps
+++ b/manifest.jps
@@ -50,7 +50,7 @@ targetNodes:
     - jenkins2
 
 homepage: https://github.com/jelastic-jps/lets-encrypt
-baseUrl: https://raw.githubusercontent.com/jelastic-jps/lets-encrypt/JE-69776
+baseUrl: https://raw.githubusercontent.com/jelastic-jps/lets-encrypt/master
 logo: images/letsencrypt.png
 
 description: