From 8254322264bdc9ee68450eab384034f5f48e2d36 Mon Sep 17 00:00:00 2001
From: Keith Irwin <git@ki9.us>
Date: Sat, 10 Sep 2022 13:22:19 -0600
Subject: [PATCH] Fixed ssl

---
 back/lib/ssl_peer_add  | 2 ++
 back/srv/dashboard/add | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/back/lib/ssl_peer_add b/back/lib/ssl_peer_add
index bee260e..3e04788 100755
--- a/back/lib/ssl_peer_add
+++ b/back/lib/ssl_peer_add
@@ -61,9 +61,11 @@ fi
 # Generate CSR
 san="subjectAltName = DNS:${hostname}.${username}.${TLD},DNS:*.${hostname}.${username}.${TLD}"
 [ "${ipstring}" != "" ] && san="${san},${ipstring}"
+<<<"${san}" grep ' ' && printf "SPACES IN SAN\n" >>"${LOGFILE}"
 if ! sudo /usr/bin/openssl req -new -sha256 -reqexts SAN \
 	-key "${SSL_CONFIG_DIR}/${username}/${hostname}/server.key" \
 	-out "${SSL_CONFIG_DIR}/${username}/${hostname}.csr" \
+	-config '/etc/ssl/openssl.cnf' \
 	-addext "${san}" \
 	-subj "/O=${SSL_ORG}/OU=${username}/CN=${hostname}.${username}.${TLD}" \
 	 >>"${LOGFILE}" 2>&1; then
diff --git a/back/srv/dashboard/add b/back/srv/dashboard/add
index 854933d..dbcf04f 100755
--- a/back/srv/dashboard/add
+++ b/back/srv/dashboard/add
@@ -134,7 +134,7 @@ if "${LIB_DIR}/ns_update_add" "${domain}" "${ipv4}" "${ipv6}"
 fi
 
 # Create SSL cert
-if "${LIB_DIR}/ssl_peer_add" "${hostname}" "${username}" "IP:${ipv4},IP:[${ipv6}]"
+if "${LIB_DIR}/ssl_peer_add" "${hostname}" "${username}" "IP:${ipv4},IP:${ipv6}"
 	then printf 'Successfully signed SSL certs for  %s,%s,%s.\n' "${domain}" "${ipv4}" "${ipv6}" >>"${LOGFILE}"
 	else printf 'ERROR! Failed to create certs for %s with IPS: %s %s!\n' "${domain}" "${ipv4}" "${ipv6}" >>"${LOGFILE}"
 fi