Hostea
/
dashboard
2
2
Fork 1
Code Issues 11 Pull Requests Projects Releases Wiki Activity

fix: s/EMAIL_SENDER_ADDRESS/DEFAULT_FROM_EMAIL/
ci/woodpecker/push/woodpecker Pipeline was successful Details
ci/woodpecker/pr/woodpecker Pipeline failed Details

fix-email-sender
Aravinth Manivannan 2022-07-04 16:07:30 +05:30
parent 5f77bbe75a
commit 59c1034b93
Signed by: realaravinth
GPG Key ID: AD9F0F08E855ED88
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/utils.py
View File

@ -47,7 +47,7 @@ def send_verification_email(request, challenge):
email = challenge.owned_by.email
sender = settings.HOSTEA["EMAIL_SENDER_ADDRESS"]
sender = settings.DEFAULT_FROM_EMAIL
send_mail(
subject="[Hostea] Please confirm your email address",

2
dashboard/local_settings.ci.py
View File

@ -56,7 +56,6 @@ PAYMENT_VARIANTS = {
HOSTEA = {
"SOURCE_CODE": "https://gitea.hostea.org/Hostea/dashboard",
"INSTANCE_MAINTAINER_CONTACT": "contact@hostea.example.org",
"EMAIL_SENDER_ADDRESS": "no-reply@hostea.org",
"ACCOUNTS": {
"MAX_VERIFICATION_TOLERANCE_PERIOD": 60 * 60 * 24, # in seconds
"SUDO_TTL": 60 * 5,
@ -86,6 +85,7 @@ HOSTEA = {
# Please see EMAIL_* configuration options:
# https://docs.djangoproject.com/en/4.1/ref/settings/#email-host
EMAIL_CONFIG = env.email("EMAIL_URL", default="smtp://admin:password@localhost:10025")
DEFAULT_FROM_EMAIL = "no-reply@hostea.org"
vars().update(EMAIL_CONFIG)

2
dashboard/local_settings.example.py
View File

@ -55,7 +55,6 @@ PAYMENT_VARIANTS = {
HOSTEA = {
"SOURCE_CODE": "https://gitea.hostea.org/Hostea/dashboard",
"INSTANCE_MAINTAINER_CONTACT": "contact@hostea.example.org",
"EMAIL_SENDER_ADDRESS": "no-reply@hostea.org",
"ACCOUNTS": {
"MAX_VERIFICATION_TOLERANCE_PERIOD": 60 * 60 * 24, # in seconds
"SUDO_TTL": 60 * 5,
@ -88,3 +87,4 @@ EMAIL_USE_SSL = False
EMAIL_PORT = 10025
EMAIL_HOST_USER = "admin"
EMAIL_HOST_PASSWORD = "password"
DEFAULT_FROM_EMAIL = "no-reply@hostea.org"

2
dashboard/settings.py
View File

@ -170,7 +170,6 @@ PAYMENT_VARIANTS = {
HOSTEA = {
"SOURCE_CODE": "https://gitea.hostea.org/Hostea/dashboard",
"RESTRICT_NEW_INTEGRATION_INSTALLATION": True,
"EMAIL_SENDER_ADDRESS": "no-reply@hostea.org",
"INSTANCE_MAINTAINER_CONTACT": "contact@hostea.example.org",
"ACCOUNTS": {
"MAX_VERIFICATION_TOLERANCE_PERIOD": 60 * 60 * 24, # in seconds
@ -204,6 +203,7 @@ EMAIL_USE_SSL = False
EMAIL_PORT = 10025
EMAIL_HOST_USER = "admin"
EMAIL_HOST_PASSWORD = "password"
DEFAULT_FROM_EMAIL: "no-reply@hostea.org"
try:
from dashboard.local_settings import *

2
infrastructure/utils.py
View File

@ -64,7 +64,7 @@ class Worker(Thread):
context=ctx,
)
sender = settings.HOSTEA["EMAIL_SENDER_ADDRESS"]
sender = settings.DEFAULT_FROM_EMAIL
send_mail(
subject="[Hostea] Your Hostea instance is now online!",

2
infrastructure/views.py
View File

@ -66,7 +66,7 @@ def create_instance(request, instance_name: str):
context=ctx,
)
sender = settings.HOSTEA["EMAIL_SENDER_ADDRESS"]
sender = settings.DEFAULT_FROM_EMAIL
send_mail(
subject="[Hostea] Your Hostea instance is now online!",