From 150344868b1d12c9b833aaccbc12cebea9f8f6fc Mon Sep 17 00:00:00 2001
From: Keith Irwin <git@ki9.us>
Date: Sat, 10 Sep 2022 13:15:49 -0600
Subject: [PATCH] Fixed ssl

---
 back/lib/ssl_peer_add  | 11 +----------
 back/srv/dashboard/add |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/back/lib/ssl_peer_add b/back/lib/ssl_peer_add
index fb3cf56..bee260e 100755
--- a/back/lib/ssl_peer_add
+++ b/back/lib/ssl_peer_add
@@ -58,17 +58,9 @@ if ! sudo chmod 400 "${SSL_CONFIG_DIR}/${username}/${hostname}/server.key" >>"${
 	exit 7
 fi
 
-# Generate config
+# Generate CSR
 san="subjectAltName = DNS:${hostname}.${username}.${TLD},DNS:*.${hostname}.${username}.${TLD}"
 [ "${ipstring}" != "" ] && san="${san},${ipstring}"
-#if ! printf '%s\n' "${san}" | sudo cat '/etc/ssl/openssl.cnf' /dev/stdin \
-#| sudo tee "${SSL_CONFIG_DIR}/${username}/${hostname}.cnf"; then
-#		printf 'Failed to generate %s/%s/%s.cnf\n' "${SSL_CONFIG_DIR}" "${username}" "${hostname}" >>"${LOGFILE}"
-#		exit 7
-#fi
-#sudo cat "${SSL_CONFIG_DIR}/${username}/${hostname}.cnf" >>"${LOGFILE}"
-
-# Generate CSR
 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" \
@@ -78,7 +70,6 @@ if ! sudo /usr/bin/openssl req -new -sha256 -reqexts SAN \
 		printf 'Failed to generate %s/%s/%s.csr\n' "${SSL_CONFIG_DIR}" "${username}" "${hostname}" >>"${LOGFILE}"
 		exit 7
 fi
-#	-config "${SSL_CONFIG_DIR}/${username}/${hostname}.cnf" 
 
 # Generate cert
 if ! sudo /usr/bin/openssl x509 -req -sha256 -extensions SAN -CAcreateserial \
diff --git a/back/srv/dashboard/add b/back/srv/dashboard/add
index dbcf04f..854933d 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