diff --git a/back/lib/ssl_peer_add b/back/lib/ssl_peer_add index f21f429..a6f5e09 100755 --- a/back/lib/ssl_peer_add +++ b/back/lib/ssl_peer_add @@ -61,14 +61,16 @@ fi # Generate config san=" [SAN] -subjectAltNames = DNS.1:${hostname}.${username}.${TLD},DNS.2:*.${hostname}.${username}.${TLD}" -[ "${ipstring}" != "" ] && san="${san},${ipstring}" +subjectAltNames = 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" + # Generate CSR if ! sudo /usr/bin/openssl req -new -sha256 -reqexts SAN \ -key "${SSL_CONFIG_DIR}/${username}/${hostname}/server.key" \ diff --git a/back/srv/dashboard/add b/back/srv/dashboard/add index 18b2e65..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.1:${ipv4},IP.2:[${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