southseact-3d/shopify-ai-backup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11 from southseact-3d/cto-task-ok-so-for-the-opensmtpd-i-get-this-error-please-fix-and-star-e01

Browse Source 
Fix OpenSMTPD binary path detection with fallback to system installation
This commit is contained in:
Liam Hetherington
2026-02-09 13:33:52 +00:00
committed by GitHub
parent 0d17918cad ee4e630b45
commit 4cd57bc012
2 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
scripts/entrypoint.sh
View File

@@ -171,9 +171,26 @@ log "Setting up OpenSMTPD service..."
# Start OpenSMTPD if configuration exists # Start OpenSMTPD if configuration exists
OPENSMTPD_CONFIG="/workspace/src/backend/app/opensmtpd/install/etc/smtpd.conf" OPENSMTPD_CONFIG="/workspace/src/backend/app/opensmtpd/install/etc/smtpd.conf"
OPENSMTPD_PID_FILE="/workspace/src/backend/app/opensmtpd/install/var/run/smtpd.pid" OPENSMTPD_PID_FILE="/workspace/src/backend/app/opensmtpd/install/var/run/smtpd.pid"
OPENSMTPD_BINARY="/workspace/src/backend/app/opensmtpd/install/sbin/smtpd" OPENSMTPD_CUSTOM_BINARY="/workspace/src/backend/app/opensmtpd/install/sbin/smtpd"
OPENSMTPD_SYSTEM_BINARY="/usr/sbin/smtpd"
if [ -f "$OPENSMTPD_CONFIG" ] && [ -x "$OPENSMTPD_BINARY" ]; then # Determine which binary to use (prefer custom, fallback to system)
OPENSMTPD_BINARY=""
if [ -x "$OPENSMTPD_CUSTOM_BINARY" ]; then
OPENSMTPD_BINARY="$OPENSMTPD_CUSTOM_BINARY"
log "Using custom OpenSMTPD binary: $OPENSMTPD_BINARY"
elif [ -x "$OPENSMTPD_SYSTEM_BINARY" ]; then
OPENSMTPD_BINARY="$OPENSMTPD_SYSTEM_BINARY"
log "Using system OpenSMTPD binary: $OPENSMTPD_BINARY"
else
# Try to find in PATH
if command -v smtpd &>/dev/null; then
OPENSMTPD_BINARY="$(command -v smtpd)"
log "Using OpenSMTPD from PATH: $OPENSMTPD_BINARY"
fi
fi
if [ -n "$OPENSMTPD_BINARY" ] && [ -f "$OPENSMTPD_CONFIG" ]; then
log "OpenSMTPD configuration found at $OPENSMTPD_CONFIG" log "OpenSMTPD configuration found at $OPENSMTPD_CONFIG"
# Ensure required directories exist with proper permissions # Ensure required directories exist with proper permissions
@@ -204,8 +221,8 @@ else
if [ ! -f "$OPENSMTPD_CONFIG" ]; then if [ ! -f "$OPENSMTPD_CONFIG" ]; then
log " Config file missing: $OPENSMTPD_CONFIG" log " Config file missing: $OPENSMTPD_CONFIG"
fi fi
if [ ! -x "$OPENSMTPD_BINARY" ]; then if [ -z "$OPENSMTPD_BINARY" ]; then
log " Binary not executable: $OPENSMTPD_BINARY" log " Binary not found at: $OPENSMTPD_CUSTOM_BINARY or $OPENSMTPD_SYSTEM_BINARY"
fi fi
fi fi

18
scripts/healthcheck.sh
View File

@@ -174,8 +174,20 @@ main() {
# Check OpenSMTPD service (ports 25, 587, 465) # Check OpenSMTPD service (ports 25, 587, 465)
health_log "INFO" "=== OpenSMTPD Service ===" health_log "INFO" "=== OpenSMTPD Service ==="
OPENSMTPD_BINARY="/workspace/src/backend/app/opensmtpd/install/sbin/smtpd" OPENSMTPD_CUSTOM_BINARY="/workspace/src/backend/app/opensmtpd/install/sbin/smtpd"
if [ -x "$OPENSMTPD_BINARY" ]; then OPENSMTPD_SYSTEM_BINARY="/usr/sbin/smtpd"
# Determine which binary to use (prefer custom, fallback to system)
OPENSMTPD_BINARY=""
if [ -x "$OPENSMTPD_CUSTOM_BINARY" ]; then
OPENSMTPD_BINARY="$OPENSMTPD_CUSTOM_BINARY"
elif [ -x "$OPENSMTPD_SYSTEM_BINARY" ]; then
OPENSMTPD_BINARY="$OPENSMTPD_SYSTEM_BINARY"
elif command -v smtpd &>/dev/null; then
OPENSMTPD_BINARY="$(command -v smtpd)"
fi
if [ -n "$OPENSMTPD_BINARY" ]; then
# Check SMTP port 25 # Check SMTP port 25
if check_port 25 "SMTP"; then if check_port 25 "SMTP"; then
health_log "INFO" "✓ SMTP port 25 is listening" health_log "INFO" "✓ SMTP port 25 is listening"
@@ -205,7 +217,7 @@ main() {
health_log "WARN" "⚠ OpenSMTPD process not found (may be disabled)" health_log "WARN" "⚠ OpenSMTPD process not found (may be disabled)"
fi fi
else else
health_log "INFO" "OpenSMTPD not installed at expected location, skipping SMTP checks" health_log "INFO" "OpenSMTPD not installed (checked: $OPENSMTPD_CUSTOM_BINARY, $OPENSMTPD_SYSTEM_BINARY, PATH), skipping SMTP checks"
fi fi
# ttyd service has been removed, no longer checking port 4501 # ttyd service has been removed, no longer checking port 4501