From 57da04b5ec7b76f45ad82ac5035a2d6dffe5ce1c Mon Sep 17 00:00:00 2001
From: 3VAbdAVE <dcollodel@outlook.com>
Date: Sun, 11 Aug 2024 22:39:47 -0400
Subject: [PATCH] Updated Unifi deploy hook to use openssl's pkcs12 instead of
 Java Keytool after Ubiquiti removed it, update system configuration for
 stronger ciphers, and back up existing certificates prior to change.

---
 deploy/unifi.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/deploy/unifi.sh b/deploy/unifi.sh
index 0a574e0d..e06f3505 100644
--- a/deploy/unifi.sh
+++ b/deploy/unifi.sh
@@ -104,6 +104,7 @@ unifi_deploy() {
 
     _debug "Generate import pkcs12"
     _import_pkcs12="$(_mktemp)"
+    _debug  "_toPkcs $_import_pkcs12 $_ckey $_ccert $_cca $_unifi_keypass unifi root"
     _toPkcs "$_import_pkcs12" "$_ckey" "$_ccert" "$_cca" "$_unifi_keypass" unifi root
     # shellcheck disable=SC2181
     if [ "$?" != "0" ]; then
@@ -153,9 +154,9 @@ unifi_deploy() {
 
     rm "$_import_pkcs12"
 
-    # Restarting unifi-core will bring up unifi, doing it out of order results in
-    # a certificate error, and may break wifiman. (unconfirmed)
-    # Restart if we aren't doing unifi-core, otherwise stop and let unifi-core restart it.
+    # Restarting unifi-core will bring up unifi, doing it out of order results in 
+    # a certificate error, and breaks wifiman.
+    # Restart if we aren't doing unifi-core, otherwise stop for later restart.
     if systemctl -q is-active unifi; then
       if [ ! -f "${DEPLOY_UNIFI_CORE_CONFIG:-/data/unifi-core/config}/unifi-core.key" ]; then
         _reload_cmd="${_reload_cmd:+$_reload_cmd && }systemctl restart unifi"