ci: remove smtp port options

IgnisDa · Jul 31, 2024 · 21a362e · 21a362e
1 parent 15ea505
commit 21a362e
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -29,7 +29,7 @@ sea-orm = { version = "=1.0.0-rc.5", features = [
     "debug-print",
     "postgres-array",
     "macros",
-    "runtime-tokio-rustls",
+    "runtime-tokio-native-tls",
     "sqlx-postgres",
     "with-chrono",
     "with-json",

diff --git a/apps/backend/Cargo.toml b/apps/backend/Cargo.toml
@@ -44,10 +44,7 @@ isolang = { version = "=2.4.0", features = ["list_languages"] }
 itertools = "=0.13.0"
 jsonwebtoken = { version = "=9.3.0", default-features = false }
 kinded = "=0.3.0"
-lettre = { version = "=0.11.7", features = [
-    "smtp-transport",
-    "builder",
-], default-features = false }
+lettre = "=0.11.7"
 markdown = "=1.0.0-alpha.18"
 mime_guess = "=2.0.5"
 nanoid = { workspace = true }

diff --git a/apps/backend/src/notification.rs b/apps/backend/src/notification.rs
@@ -163,9 +163,8 @@ impl NotificationPlatformSpecifics {
                     config.server.smtp.password.to_owned(),
                 );
 
-                let mailer = SmtpTransport::starttls_relay(&config.server.smtp.server)
+                let mailer = SmtpTransport::relay(&config.server.smtp.server)
                     .unwrap()
-                    .port(config.server.smtp.port)
                     .credentials(credentials)
                     .build();
 

diff --git a/docs/includes/backend-config-schema.yaml b/docs/includes/backend-config-schema.yaml
@@ -206,9 +206,6 @@ server:
     # @envvar SERVER_SMTP_PASSWORD
     password: ""
 
-    # @envvar SERVER_SMTP_PORT
-    port: 587
-
     # @envvar SERVER_SMTP_SERVER
     server: ""
 

diff --git a/libs/config/src/lib.rs b/libs/config/src/lib.rs
@@ -338,8 +338,6 @@ pub struct SchedulerConfig {
 #[config(rename_all = "snake_case", env_prefix = "SERVER_SMTP_")]
 pub struct SmtpConfig {
     pub server: String,
-    #[setting(default = 587)]
-    pub port: u16,
     pub user: String,
     pub password: String,
     #[setting(default = "Ryot <[email protected]>")]