From 6d125d46e37bba2ea39cceeac2ff7bc02bbc74a2 Mon Sep 17 00:00:00 2001
From: Anthony <tony@mightybox.io>
Date: Wed, 20 Aug 2025 00:31:19 +0800
Subject: [PATCH] minor adjustmentsand fixes to ssl manager

---
 scripts/ssl-manager/ssl_manager.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/ssl-manager/ssl_manager.sh b/scripts/ssl-manager/ssl_manager.sh
index d40fbc6..f2f50ee 100644
--- a/scripts/ssl-manager/ssl_manager.sh
+++ b/scripts/ssl-manager/ssl_manager.sh
@@ -94,7 +94,7 @@ on_exit() {
     fi
     exit $SCRIPT_EXIT_STATUS
 }
-trap 'on_exit' EXIT
+trap 'rc=$?; SCRIPT_EXIT_STATUS=$rc; on_exit' EXIT
 
 check_command() {
     local cmd="$1"
@@ -208,7 +208,7 @@ update_httpd_config() {
 		cat <<EOF | sudo tee "$vhconf_file" >/dev/null
 <?xml version="1.0" encoding="UTF-8"?>
 <virtualHostConfig>
-  <docRoot>$VH_ROOT/ROOT/</docRoot>
+  <docRoot>\$VH_ROOT/ROOT/</docRoot>
   <enableGzip>1</enableGzip>
   <vhssl>
     <keyFile>/etc/letsencrypt/live/$domain/privkey.pem</keyFile>
@@ -255,7 +255,7 @@ EOF
 	local https6_listener_exists
 	https6_listener_exists=$(xmlstarlet sel -t -v "/httpServerConfig/listenerList/listener[name='HTTPS-ipv6']/name" "$CONF_FILE" 2>/dev/null || true)
 	if [[ -z "$https_listener_exists" ]]; then
-		log_error "HTTPS listener not found in $CONF_FILE. Cannot proceed with SNI mapping."
+		log_error "HTTPS listener not found in $CONF_FILE. Cannot proceed with SNI mapping."git add
 		SCRIPT_EXIT_STATUS=1; return 1
 	fi