From c2253fb62abdaab88b8418799b5f2bcc8c16ec84 Mon Sep 17 00:00:00 2001 From: John Lancaster <32917998+jsl12@users.noreply.github.com> Date: Sun, 28 Dec 2025 18:16:46 -0600 Subject: [PATCH] fixed some paths --- scripts/check_status.sh | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/scripts/check_status.sh b/scripts/check_status.sh index c4e09a0..c55c12d 100755 --- a/scripts/check_status.sh +++ b/scripts/check_status.sh @@ -8,33 +8,30 @@ NC='\033[0m' # No Color print_status() { local item="$1" local status="$2" + local error_msg="$3" if [ "$status" -eq 0 ]; then echo -e "${item}: ${GREEN}OK${NC}" else echo -e "${item}: ${RED}FAIL${NC}" + if [ -n "$error_msg" ]; then + echo -e " ${RED}Error:${NC} $error_msg" + fi EXIT_CODE=1 fi } EXIT_CODE=0 -# Determine Project Directory -if [ -d "certs" ] && [ -f "Caddyfile" ]; then - PROJECT_DIR="$PWD" -else - PROJECT_DIR="/home/john/soteria" -fi - -CERTS_DIR="$PROJECT_DIR/certs" -SERVER_CERT="$CERTS_DIR/soteria.crt" -SERVER_KEY="$CERTS_DIR/soteria.key" +CERTS_DIR="$(readlink -f ~/.step/certs)" +SERVER_CERT="$CERTS_DIR/restic.crt" +SERVER_KEY="$CERTS_DIR/restic.key" TIMER_NAME="cert-renewer.timer" # 1. Check Certificates Existence if [ -f "$SERVER_CERT" ] && [ -f "$SERVER_KEY" ]; then print_status "Certificate Files" 0 else - print_status "Certificate Files" 1 + print_status "Certificate Files" 1 "Missing $SERVER_CERT or $SERVER_KEY" fi # 2. Check Certificate Validity (Is it valid NOW?) @@ -43,7 +40,7 @@ if [ -f "$SERVER_CERT" ] && command -v openssl &> /dev/null; then if openssl x509 -checkend 60 -noout -in "$SERVER_CERT" &> /dev/null; then print_status "Certificate Validity" 0 else - print_status "Certificate Validity" 1 + print_status "Certificate Validity" 1 "Certificate at $SERVER_CERT is expired or expiring within 60s" fi fi @@ -51,7 +48,7 @@ fi if systemctl is-active "$TIMER_NAME" &> /dev/null; then print_status "Renewal Timer" 0 else - print_status "Renewal Timer" 1 + print_status "Renewal Timer" 1 "Systemd timer '$TIMER_NAME' is not active" fi exit $EXIT_CODE