highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-09-21 14:12:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add MAIL_FROM env variable (#949)

Browse Source 
Co-authored-by: Roman Tyshyk <roman.tyshyk@711media.de>
This commit is contained in:
Roman
2024-01-16 06:53:03 +01:00
committed by GitHub
parent 44905d36e5
commit 621967d2b6
5 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/danswer/auth/users.py
View File

@@ -38,6 +38,7 @@ from danswer.configs.app_configs import SMTP_PASS
from danswer.configs.app_configs import SMTP_PORT from danswer.configs.app_configs import SMTP_PORT
from danswer.configs.app_configs import SMTP_SERVER from danswer.configs.app_configs import SMTP_SERVER
from danswer.configs.app_configs import SMTP_USER from danswer.configs.app_configs import SMTP_USER
from danswer.configs.app_configs import MAIL_FROM
from danswer.configs.app_configs import VALID_EMAIL_DOMAINS from danswer.configs.app_configs import VALID_EMAIL_DOMAINS
from danswer.configs.app_configs import WEB_DOMAIN from danswer.configs.app_configs import WEB_DOMAIN
from danswer.configs.constants import AuthType from danswer.configs.constants import AuthType
@@ -111,6 +112,7 @@ def send_user_verification_email(user_email: str, token: str) -> None:
msg = MIMEMultipart() msg = MIMEMultipart()
msg["Subject"] = "Danswer Email Verification" msg["Subject"] = "Danswer Email Verification"
msg["To"] = user_email msg["To"] = user_email
msg["From"] = MAIL_FROM
link = f"{WEB_DOMAIN}/auth/verify-email?token={token}" link = f"{WEB_DOMAIN}/auth/verify-email?token={token}"

1
backend/danswer/configs/app_configs.py
View File

@@ -81,6 +81,7 @@ SMTP_SERVER = os.environ.get("SMTP_SERVER") or "smtp.gmail.com"
SMTP_PORT = int(os.environ.get("SMTP_PORT") or "587") SMTP_PORT = int(os.environ.get("SMTP_PORT") or "587")
SMTP_USER = os.environ.get("SMTP_USER", "your-email@gmail.com") SMTP_USER = os.environ.get("SMTP_USER", "your-email@gmail.com")
SMTP_PASS = os.environ.get("SMTP_PASS", "your-gmail-password") SMTP_PASS = os.environ.get("SMTP_PASS", "your-gmail-password")
MAIL_FROM = os.environ.get("EMAIL_FROM", SMTP_USER)
##### #####

1
deployment/docker_compose/docker-compose.dev.yml
View File

@@ -27,6 +27,7 @@ services:
- SMTP_PORT=${SMTP_PORT:-587} # For sending verification emails, if unspecified then defaults to '587' - SMTP_PORT=${SMTP_PORT:-587} # For sending verification emails, if unspecified then defaults to '587'
- SMTP_USER=${SMTP_USER:-} - SMTP_USER=${SMTP_USER:-}
- SMTP_PASS=${SMTP_PASS:-} - SMTP_PASS=${SMTP_PASS:-}
- MAIL_FROM=${MAIL_FROM:-}
# Gen AI Settings # Gen AI Settings
- GEN_AI_MODEL_PROVIDER=${GEN_AI_MODEL_PROVIDER:-openai} - GEN_AI_MODEL_PROVIDER=${GEN_AI_MODEL_PROVIDER:-openai}
- GEN_AI_MODEL_VERSION=${GEN_AI_MODEL_VERSION:-gpt-3.5-turbo} - GEN_AI_MODEL_VERSION=${GEN_AI_MODEL_VERSION:-gpt-3.5-turbo}

2
deployment/docker_compose/env.prod.template
View File

@@ -47,6 +47,8 @@ SECRET=
# The below are only needed if you aren't using gmail as your SMTP # The below are only needed if you aren't using gmail as your SMTP
#SMTP_SERVER= #SMTP_SERVER=
#SMTP_PORT= #SMTP_PORT=
# when missing SMTP_USER used instead
#MAIL_FROM=
# OpenID Connect (OIDC) # OpenID Connect (OIDC)
#OPENID_CONFIG_URL= #OPENID_CONFIG_URL=

1
deployment/kubernetes/env-configmap.yaml
View File

@@ -11,6 +11,7 @@ data:
SMTP_PORT: "" # For sending verification emails, if unspecified then defaults to '587' SMTP_PORT: "" # For sending verification emails, if unspecified then defaults to '587'
SMTP_USER: "" # 'your-email@company.com' SMTP_USER: "" # 'your-email@company.com'
SMTP_PASS: "" # 'your-gmail-password' SMTP_PASS: "" # 'your-gmail-password'
MAIL_FROM: "" # 'your-email@company.com' SMTP_USER missing used instead
# Gen AI Settings # Gen AI Settings
GEN_AI_MODEL_PROVIDER: "openai" GEN_AI_MODEL_PROVIDER: "openai"
GEN_AI_MODEL_VERSION: "gpt-3.5-turbo" # Use GPT-4 if you have it GEN_AI_MODEL_VERSION: "gpt-3.5-turbo" # Use GPT-4 if you have it