Moved default of email port env to go code instead of docker compose …

…(#122)
ducompsoc · Aug 28, 2024 · 971014e · 971014e
1 parent 1c9919c
commit 971014e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -6,7 +6,7 @@ services:
             - MONGODB_URI=${MONGODB_URI}
             - JURY_ADMIN_PASSWORD=${JURY_ADMIN_PASSWORD}
             - EMAIL_HOST=${EMAIL_HOST}
-            - EMAIL_PORT=${EMAIL_PORT:587}
+            - EMAIL_PORT=${EMAIL_PORT}
             - EMAIL_FROM=${EMAIL_FROM}
             - EMAIL_FROM_NAME=${EMAIL_FROM_NAME}
             - EMAIL_USERNAME=${EMAIL_USERNAME}

diff --git a/server/funcs/email.go b/server/funcs/email.go
@@ -41,7 +41,7 @@ func SendJudgeEmail(judge *models.Judge, hostname string) error {
 
 	// SMTP server configuration
 	smtpHost := config.GetEnv("EMAIL_HOST")
-	smtpPort := config.GetEnv("EMAIL_PORT")
+	smtpPort := config.GetOptEnv("EMAIL_PORT", "587")
 
 	// Auth
 	auth := smtp.PlainAuth("jury", username, password, smtpHost)