diff --git a/back/lib/ssl_peer_add b/back/lib/ssl_peer_add index 849f690..552b5fc 100755 --- a/back/lib/ssl_peer_add +++ b/back/lib/ssl_peer_add @@ -61,15 +61,15 @@ fi # Generate config san="\n[SAN]\nsubjectAltNames=DNS:${hostname}.${username}.${TLD},DNS:*.${hostname}.${username}.${TLD}" [ "${ipstring}" != "" ] && san="${san},${ipstring}" -printf "${san}" >>"${LOGFILE}" +printf "${san}\n" >>"${LOGFILE}" set -x -if ! printf '%s' "${san}" | sudo cat '/etc/ssl/openssl.cnf' /dev/stdin \ -| sudo tee "${SSL_CONFIG_DIR:?}/${username:?}/${hostname:?}.cnf"; then - printf 'Failed to generate %s/%s.cnf\n' "${username}" "${hostname}" >>"${LOGFILE}" +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}" + sudo tail "${SSL_CONFIG_DIR:?}/${username:?}/${hostname:?}.cnf" >>"${LOGFILE}" exit 7 fi set +x -sudo tail "${SSL_CONFIG_DIR:?}/${username:?}/${hostname:?}.cnf" >>"${LOGFILE}" # Generate CSR if ! sudo /usr/bin/openssl req -new -sha256 -reqexts SAN \