From 3d43f3878afdcdf7b462af203f079e07ae62e313 Mon Sep 17 00:00:00 2001 From: Keith Irwin Date: Sat, 10 Sep 2022 11:59:05 -0600 Subject: [PATCH] Fixed if statement hopefully --- back/lib/ssl_peer_add | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/back/lib/ssl_peer_add b/back/lib/ssl_peer_add index ab904df..8596e26 100755 --- a/back/lib/ssl_peer_add +++ b/back/lib/ssl_peer_add @@ -46,10 +46,10 @@ fi if ! sudo /usr/bin/openssl genrsa -out "${SSL_CONFIG_DIR:?}/${username:?}/${hostname:?}/server.key" >>/dev/null 2>&1; then printf 'Failed to generate SSL key %s/%s/%s/server.key\n' "${SSL_CONFIG_DIR}" "${username}" "${hostname}" >>"${LOGFILE}" exit 7 -elif ! [ -f "${SSL_CONFIG_DIR}/${username}/${hostname}/server.key" ]; then +fi; if ! [ -f "${SSL_CONFIG_DIR}/${username}/${hostname}/server.key" ]; then printf 'SSL key %s/%s/%s/server.key was not generated!\n' "${SSL_CONFIG_DIR}" "${username}" "${hostname}" >>"${LOGFILE}" exit 7 -elif ! sudo chmod 400 "${SSL_CONFIG_DIR}/${username}/${hostname}/server.key" >>"${LOGFILE}" 2>&1; then +fi; if ! sudo chmod 400 "${SSL_CONFIG_DIR}/${username}/${hostname}/server.key" >>"${LOGFILE}" 2>&1; then printf 'Failed to chmod SSL key %s/%s/%s/server.key\n' "${SSL_CONFIG_DIR}" "${username}" "${hostname}" >>"${LOGFILE}" exit 7 fi @@ -85,10 +85,10 @@ if ! sudo /usr/bin/openssl x509 -req -sha256 -extensions SAN -CAcreateserial \ -days "${SSL_DAYS}" >>"${LOGFILE}" 2>&1; then printf 'Failed to generate SSL cert %s/%s/server.crt\n' "${username}" "${hostname}" >>"${LOGFILE}" exit 7 -elif ! [ -f "${SSL_CONFIG_DIR:?}/${username:?}/${hostname:?}/server.crt" ]; then +fi; if ! [ -f "${SSL_CONFIG_DIR:?}/${username:?}/${hostname:?}/server.crt" ]; then printf 'SSL key %s/%s/server.crt was not generated!\n' "${username}" "${hostname}" >>"${LOGFILE}" exit 7 -elif ! sudo chmod 644 "${SSL_CONFIG_DIR}/${username}/${hostname}/server.crt"; then +fi; if ! sudo chmod 644 "${SSL_CONFIG_DIR}/${username}/${hostname}/server.crt"; then printf 'Failed to chmod SSL cert %s/%s/server.crt\n' "${username}" "${hostname}" >>"${LOGFILE}" exit 7 fi