From 8a27c902ff93ea3adb140e4fc1bcc2e71e4260d9 Mon Sep 17 00:00:00 2001
From: Szabolcs Magyar <699745+magyarsz@users.noreply.github.com>
Date: Tue, 25 Mar 2025 19:29:12 +0100
Subject: [PATCH 1/4] Fix error message variable when reload cmd returns with
 an error

---
 acme.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/acme.sh b/acme.sh
index 2cf681eb..dd21785d 100755
--- a/acme.sh
+++ b/acme.sh
@@ -5986,7 +5986,7 @@ _installcert() {
     ); then
       _info "$(__green "Reload successful")"
     else
-      _err "Reload error for: $Le_Domain"
+      _err "Reload error for: $_main_domain"
     fi
   fi
 

From 93c19356d02503354eb0f60331dcb8876fa250c5 Mon Sep 17 00:00:00 2001
From: ms264556 <29752086+ms264556@users.noreply.github.com>
Date: Thu, 27 Mar 2025 14:03:08 +1300
Subject: [PATCH 2/4] Don't deploy ECC certs to legacy Ruckus

---
 deploy/ruckus.sh | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/deploy/ruckus.sh b/deploy/ruckus.sh
index f62e2fc0..d0fa4c3d 100755
--- a/deploy/ruckus.sh
+++ b/deploy/ruckus.sh
@@ -116,6 +116,30 @@ ruckus_deploy() {
   _H2="X-CSRF-Token: $(_response_header 'HTTP_X_CSRF_TOKEN')"
   export _H2
 
+  if _isRSA "$_ckey" >/dev/null 2>&1; then
+    _debug "Using RSA certificate."
+  else
+    _info "Verifying ECC certificate support."
+
+    _ul_version="$(_get_unleashed_version)"
+    if [ -z "$_ul_version" ]; then
+      _err "Your controller doesn't support ECC certificates. Please deploy an RSA certificate."
+      return 1
+    fi
+
+    _ul_version_major="$(echo "$_ul_version" | cut -d . -f 1)"
+    _ul_version_minor="$(echo "$_ul_version" | cut -d . -f 2)"
+    if [ "$_ul_version_major" -lt "200" ]; then
+      _err "ZoneDirector doesn't support ECC certificates. Please deploy an RSA certificate."
+      return 1
+    elif [ "$_ul_version_minor" -lt "13" ]; then
+      _err "Unleashed $_ul_version_major.$_ul_version_minor doesn't support ECC certificates. Please deploy an RSA certificate or upgrade to Unleashed 200.13+."
+      return 1
+    fi
+
+    _debug "ECC certificates OK for Unleashed $_ul_version_major.$_ul_version_minor."
+  fi
+
   _info "Uploading certificate"
   _post_upload "uploadcert" "$_cfullchain"
 
@@ -145,6 +169,10 @@ _response_cookie() {
   _response_header 'Set-Cookie' | sed 's/;.*//'
 }
 
+_get_unleashed_version() {
+  _post '<ajax-request action="getstat" comp="system"><sysinfo/></ajax-request>' "$_base_url/_cmdstat.jsp" | _egrep_o "version-num=\"[^\"]*\"" | cut -d '"' -f 2
+}
+
 _post_upload() {
   _post_action="$1"
   _post_file="$2"

From a1de13657e79c5471dbc8fa3539ea39160937389 Mon Sep 17 00:00:00 2001
From: neil <gitpc@neilpang.com>
Date: Fri, 28 Mar 2025 20:50:08 +0100
Subject: [PATCH 3/4] minor, just copy necessary files

---
 Dockerfile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 3f400283..4d7d22b1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,7 +22,11 @@ ARG AUTO_UPGRADE=1
 ENV AUTO_UPGRADE=$AUTO_UPGRADE
 
 #Install
-COPY ./ /install_acme.sh/
+COPY ./acme.sh /install_acme.sh/acme.sh
+COPY ./deploy /install_acme.sh/deploy
+COPY ./dnsapi /install_acme.sh/dnsapi
+COPY ./notify /install_acme.sh/notify
+
 RUN cd /install_acme.sh && ([ -f /install_acme.sh/acme.sh ] && /install_acme.sh/acme.sh --install || curl https://get.acme.sh | sh) && rm -rf /install_acme.sh/
 
 

From 40b6db6a2715628aa977ed1853fe5256704010ae Mon Sep 17 00:00:00 2001
From: neil <gitpc@neilpang.com>
Date: Sat, 29 Mar 2025 21:14:56 +0100
Subject: [PATCH 4/4] persist-credentials: false

---
 .github/workflows/dockerhub.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
index 435fd6b5..49173b4b 100644
--- a/.github/workflows/dockerhub.yml
+++ b/.github/workflows/dockerhub.yml
@@ -44,6 +44,8 @@ jobs:
     steps:
       - name: checkout code
         uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
       - name: Extract Docker metadata