fixed some paths

This commit is contained in:
John Lancaster
2025-12-28 18:16:46 -06:00
parent 84776ad57b
commit c2253fb62a

View File

@@ -8,33 +8,30 @@ NC='\033[0m' # No Color
print_status() { print_status() {
local item="$1" local item="$1"
local status="$2" local status="$2"
local error_msg="$3"
if [ "$status" -eq 0 ]; then if [ "$status" -eq 0 ]; then
echo -e "${item}: ${GREEN}OK${NC}" echo -e "${item}: ${GREEN}OK${NC}"
else else
echo -e "${item}: ${RED}FAIL${NC}" echo -e "${item}: ${RED}FAIL${NC}"
if [ -n "$error_msg" ]; then
echo -e " ${RED}Error:${NC} $error_msg"
fi
EXIT_CODE=1 EXIT_CODE=1
fi fi
} }
EXIT_CODE=0 EXIT_CODE=0
# Determine Project Directory CERTS_DIR="$(readlink -f ~/.step/certs)"
if [ -d "certs" ] && [ -f "Caddyfile" ]; then SERVER_CERT="$CERTS_DIR/restic.crt"
PROJECT_DIR="$PWD" SERVER_KEY="$CERTS_DIR/restic.key"
else
PROJECT_DIR="/home/john/soteria"
fi
CERTS_DIR="$PROJECT_DIR/certs"
SERVER_CERT="$CERTS_DIR/soteria.crt"
SERVER_KEY="$CERTS_DIR/soteria.key"
TIMER_NAME="cert-renewer.timer" TIMER_NAME="cert-renewer.timer"
# 1. Check Certificates Existence # 1. Check Certificates Existence
if [ -f "$SERVER_CERT" ] && [ -f "$SERVER_KEY" ]; then if [ -f "$SERVER_CERT" ] && [ -f "$SERVER_KEY" ]; then
print_status "Certificate Files" 0 print_status "Certificate Files" 0
else else
print_status "Certificate Files" 1 print_status "Certificate Files" 1 "Missing $SERVER_CERT or $SERVER_KEY"
fi fi
# 2. Check Certificate Validity (Is it valid NOW?) # 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 if openssl x509 -checkend 60 -noout -in "$SERVER_CERT" &> /dev/null; then
print_status "Certificate Validity" 0 print_status "Certificate Validity" 0
else else
print_status "Certificate Validity" 1 print_status "Certificate Validity" 1 "Certificate at $SERVER_CERT is expired or expiring within 60s"
fi fi
fi fi
@@ -51,7 +48,7 @@ fi
if systemctl is-active "$TIMER_NAME" &> /dev/null; then if systemctl is-active "$TIMER_NAME" &> /dev/null; then
print_status "Renewal Timer" 0 print_status "Renewal Timer" 0
else else
print_status "Renewal Timer" 1 print_status "Renewal Timer" 1 "Systemd timer '$TIMER_NAME' is not active"
fi fi
exit $EXIT_CODE exit $EXIT_CODE