From f3216330a17b4c93b8c78996cd30228feea5055e Mon Sep 17 00:00:00 2001 From: Abdullah Atta Date: Thu, 29 Aug 2024 12:19:37 +0500 Subject: [PATCH] docker: remove even more unnecessary env vars --- .env | 14 +++----------- Streetwriters.Common/Constants.cs | 5 +---- Streetwriters.Common/Servers.cs | 3 --- Streetwriters.Identity/Services/EmailSender.cs | 2 +- docker-compose.yml | 3 --- 5 files changed, 5 insertions(+), 22 deletions(-) diff --git a/.env b/.env index 85e5d99..bdf2e00 100644 --- a/.env +++ b/.env @@ -30,7 +30,7 @@ SMTP_HOST= # Example: 465 SMTP_PORT= # Description: The FROM email address when sending out emails. Must be an email address under your control otherwise sending will fail. Most times it is the same email address as the SMTP_USERNAME. -# Required: yes +# Required: no # Example: support@notesnook.com NOTESNOOK_SENDER_EMAIL= # Description: The reply-to email is used whenever a user is replying to the email you sent. You can use this to set a different reply-to email address than the one you used to send the email. @@ -49,18 +49,10 @@ TWILIO_AUTH_TOKEN= # Example: VAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa TWILIO_SERVICE_SID= -# Description: This is the public domain for the Authentication server. It can also be the IP address if you don't own a domain name. The domain/IP must be accessible from wherever you are running the Notesnook clients. -# Required: yes -# Example: api.notesnook.com -NOTESNOOK_SERVER_DOMAIN= -# Description: This is the public domain for the Authentication server. It can also be the IP address if you don't own a domain name. The domain/IP must be accessible from wherever you are running the Notesnook clients. +# Description: This is the public domain for the Authentication server. It can also be the IP address if you don't own a domain name. The domain/IP must be accessible from wherever you are running the Notesnook clients. Used for generating email confirmation & password reset URLs. # Required: yes # Example: auth.streetwriters.co -IDENTITY_SERVER_DOMAIN= -# Description: This is the public domain for the Authentication server. It can also be the IP address if you don't own a domain name. The domain/IP must be accessible from wherever you are running the Notesnook clients. -# Required: yes -# Example: events.streetwriters.co -SSE_SERVER_DOMAIN= +IDENTITY_SERVER_DOMAIN=localhost:8264 # Description: Add the origins for which you want to allow CORS. Leave it empty to allow all origins to access your server. If you want to allow multiple origins, seperate each origin with a comma. # Required: no diff --git a/Streetwriters.Common/Constants.cs b/Streetwriters.Common/Constants.cs index ff3aa9e..3f986a8 100644 --- a/Streetwriters.Common/Constants.cs +++ b/Streetwriters.Common/Constants.cs @@ -43,7 +43,7 @@ namespace Streetwriters.Common public static string SMTP_HOST => Environment.GetEnvironmentVariable("SMTP_HOST"); public static string SMTP_PORT => Environment.GetEnvironmentVariable("SMTP_PORT"); public static string SMTP_REPLYTO_EMAIL => Environment.GetEnvironmentVariable("SMTP_REPLYTO_EMAIL"); - public static string NOTESNOOK_SENDER_EMAIL => Environment.GetEnvironmentVariable("NOTESNOOK_SENDER_EMAIL"); + public static string NOTESNOOK_SENDER_EMAIL => Environment.GetEnvironmentVariable("NOTESNOOK_SENDER_EMAIL") ?? Environment.GetEnvironmentVariable("SMTP_USERNAME"); public static string NOTESNOOK_APP_HOST => Environment.GetEnvironmentVariable("NOTESNOOK_APP_HOST"); public static string NOTESNOOK_API_SECRET => Environment.GetEnvironmentVariable("NOTESNOOK_API_SECRET"); @@ -55,7 +55,6 @@ namespace Streetwriters.Common // Server discovery public static int NOTESNOOK_SERVER_PORT => int.Parse(Environment.GetEnvironmentVariable("NOTESNOOK_SERVER_PORT") ?? "80"); public static string NOTESNOOK_SERVER_HOST => Environment.GetEnvironmentVariable("NOTESNOOK_SERVER_HOST"); - public static string NOTESNOOK_SERVER_DOMAIN => Environment.GetEnvironmentVariable("NOTESNOOK_SERVER_DOMAIN"); public static string NOTESNOOK_CERT_PATH => Environment.GetEnvironmentVariable("NOTESNOOK_CERT_PATH"); public static string NOTESNOOK_CERT_KEY_PATH => Environment.GetEnvironmentVariable("NOTESNOOK_CERT_KEY_PATH"); @@ -67,7 +66,6 @@ namespace Streetwriters.Common public static int SSE_SERVER_PORT => int.Parse(Environment.GetEnvironmentVariable("SSE_SERVER_PORT") ?? "80"); public static string SSE_SERVER_HOST => Environment.GetEnvironmentVariable("SSE_SERVER_HOST"); - public static string SSE_SERVER_DOMAIN => Environment.GetEnvironmentVariable("SSE_SERVER_DOMAIN"); public static string SSE_CERT_PATH => Environment.GetEnvironmentVariable("SSE_CERT_PATH"); public static string SSE_CERT_KEY_PATH => Environment.GetEnvironmentVariable("SSE_CERT_KEY_PATH"); @@ -76,7 +74,6 @@ namespace Streetwriters.Common public static string MONGODB_DATABASE_NAME => Environment.GetEnvironmentVariable("MONGODB_DATABASE_NAME"); public static int SUBSCRIPTIONS_SERVER_PORT => int.Parse(Environment.GetEnvironmentVariable("SUBSCRIPTIONS_SERVER_PORT") ?? "80"); public static string SUBSCRIPTIONS_SERVER_HOST => Environment.GetEnvironmentVariable("SUBSCRIPTIONS_SERVER_HOST"); - public static string SUBSCRIPTIONS_SERVER_DOMAIN => Environment.GetEnvironmentVariable("SUBSCRIPTIONS_SERVER_DOMAIN"); public static string SUBSCRIPTIONS_CERT_PATH => Environment.GetEnvironmentVariable("SUBSCRIPTIONS_CERT_PATH"); public static string SUBSCRIPTIONS_CERT_KEY_PATH => Environment.GetEnvironmentVariable("SUBSCRIPTIONS_CERT_KEY_PATH"); public static string[] NOTESNOOK_CORS_ORIGINS => Environment.GetEnvironmentVariable("NOTESNOOK_CORS")?.Split(",") ?? new string[] { }; diff --git a/Streetwriters.Common/Servers.cs b/Streetwriters.Common/Servers.cs index 9d63537..d81b16b 100644 --- a/Streetwriters.Common/Servers.cs +++ b/Streetwriters.Common/Servers.cs @@ -92,7 +92,6 @@ namespace Streetwriters.Common #endif public static Server NotesnookAPI { get; } = new(Constants.NOTESNOOK_CERT_PATH, Constants.NOTESNOOK_CERT_KEY_PATH) { - Domain = Constants.NOTESNOOK_SERVER_DOMAIN, Port = Constants.NOTESNOOK_SERVER_PORT, Hostname = Constants.NOTESNOOK_SERVER_HOST, Id = "notesnook-sync" @@ -100,7 +99,6 @@ namespace Streetwriters.Common public static Server MessengerServer { get; } = new(Constants.SSE_CERT_PATH, Constants.SSE_CERT_KEY_PATH) { - Domain = Constants.SSE_SERVER_DOMAIN, Port = Constants.SSE_SERVER_PORT, Hostname = Constants.SSE_SERVER_HOST, Id = "sse" @@ -116,7 +114,6 @@ namespace Streetwriters.Common public static Server SubscriptionServer { get; } = new(Constants.SUBSCRIPTIONS_CERT_PATH, Constants.SUBSCRIPTIONS_CERT_KEY_PATH) { - Domain = Constants.SUBSCRIPTIONS_SERVER_DOMAIN, Port = Constants.SUBSCRIPTIONS_SERVER_PORT, Hostname = Constants.SUBSCRIPTIONS_SERVER_HOST, Id = "subscription" diff --git a/Streetwriters.Identity/Services/EmailSender.cs b/Streetwriters.Identity/Services/EmailSender.cs index eacdca2..941dd38 100644 --- a/Streetwriters.Identity/Services/EmailSender.cs +++ b/Streetwriters.Identity/Services/EmailSender.cs @@ -179,7 +179,7 @@ namespace Streetwriters.Identity.Services { if (int.TryParse(Constants.SMTP_PORT, out int port)) { - await mailClient.ConnectAsync(Constants.SMTP_HOST, port, MailKit.Security.SecureSocketOptions.StartTls); + await mailClient.ConnectAsync(Constants.SMTP_HOST, port, MailKit.Security.SecureSocketOptions.Auto); } else { diff --git a/docker-compose.yml b/docker-compose.yml index 23c3b93..734a4a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,10 +27,7 @@ services: "SMTP_PASSWORD" "SMTP_HOST" "SMTP_PORT" - "NOTESNOOK_SENDER_EMAIL" - "NOTESNOOK_SERVER_DOMAIN" "IDENTITY_SERVER_DOMAIN" - "SSE_SERVER_DOMAIN" "NOTESNOOK_APP_HOST" )