fix: s/EMAIL_SENDER_ADDRESS/DEFAULT_FROM_EMAIL/
ci/woodpecker/push/woodpecker Pipeline was successful
Details
ci/woodpecker/push/woodpecker Pipeline was successful
Details
parent
eb68b1e984
commit
9303ea59ed
|
@ -47,7 +47,7 @@ def send_verification_email(request, challenge):
|
||||||
|
|
||||||
email = challenge.owned_by.email
|
email = challenge.owned_by.email
|
||||||
|
|
||||||
sender = settings.HOSTEA["EMAIL_SENDER_ADDRESS"]
|
sender = settings.DEFAULT_FROM_EMAIL
|
||||||
|
|
||||||
send_mail(
|
send_mail(
|
||||||
subject="[Hostea] Please confirm your email address",
|
subject="[Hostea] Please confirm your email address",
|
||||||
|
|
|
@ -56,7 +56,6 @@ PAYMENT_VARIANTS = {
|
||||||
HOSTEA = {
|
HOSTEA = {
|
||||||
"SOURCE_CODE": "https://gitea.hostea.org/Hostea/dashboard",
|
"SOURCE_CODE": "https://gitea.hostea.org/Hostea/dashboard",
|
||||||
"INSTANCE_MAINTAINER_CONTACT": "contact@hostea.example.org",
|
"INSTANCE_MAINTAINER_CONTACT": "contact@hostea.example.org",
|
||||||
"EMAIL_SENDER_ADDRESS": "no-reply@hostea.org",
|
|
||||||
"ACCOUNTS": {
|
"ACCOUNTS": {
|
||||||
"MAX_VERIFICATION_TOLERANCE_PERIOD": 60 * 60 * 24, # in seconds
|
"MAX_VERIFICATION_TOLERANCE_PERIOD": 60 * 60 * 24, # in seconds
|
||||||
"SUDO_TTL": 60 * 5,
|
"SUDO_TTL": 60 * 5,
|
||||||
|
@ -86,6 +85,7 @@ HOSTEA = {
|
||||||
# Please see EMAIL_* configuration options:
|
# Please see EMAIL_* configuration options:
|
||||||
# https://docs.djangoproject.com/en/4.1/ref/settings/#email-host
|
# https://docs.djangoproject.com/en/4.1/ref/settings/#email-host
|
||||||
EMAIL_CONFIG = env.email("EMAIL_URL", default="smtp://admin:password@localhost:10025")
|
EMAIL_CONFIG = env.email("EMAIL_URL", default="smtp://admin:password@localhost:10025")
|
||||||
|
DEFAULT_FROM_EMAIL = "no-reply@hostea.org"
|
||||||
|
|
||||||
vars().update(EMAIL_CONFIG)
|
vars().update(EMAIL_CONFIG)
|
||||||
|
|
||||||
|
|
|
@ -55,7 +55,6 @@ PAYMENT_VARIANTS = {
|
||||||
HOSTEA = {
|
HOSTEA = {
|
||||||
"SOURCE_CODE": "https://gitea.hostea.org/Hostea/dashboard",
|
"SOURCE_CODE": "https://gitea.hostea.org/Hostea/dashboard",
|
||||||
"INSTANCE_MAINTAINER_CONTACT": "contact@hostea.example.org",
|
"INSTANCE_MAINTAINER_CONTACT": "contact@hostea.example.org",
|
||||||
"EMAIL_SENDER_ADDRESS": "no-reply@hostea.org",
|
|
||||||
"ACCOUNTS": {
|
"ACCOUNTS": {
|
||||||
"MAX_VERIFICATION_TOLERANCE_PERIOD": 60 * 60 * 24, # in seconds
|
"MAX_VERIFICATION_TOLERANCE_PERIOD": 60 * 60 * 24, # in seconds
|
||||||
"SUDO_TTL": 60 * 5,
|
"SUDO_TTL": 60 * 5,
|
||||||
|
@ -88,3 +87,4 @@ EMAIL_USE_SSL = False
|
||||||
EMAIL_PORT = 10025
|
EMAIL_PORT = 10025
|
||||||
EMAIL_HOST_USER = "admin"
|
EMAIL_HOST_USER = "admin"
|
||||||
EMAIL_HOST_PASSWORD = "password"
|
EMAIL_HOST_PASSWORD = "password"
|
||||||
|
DEFAULT_FROM_EMAIL = "no-reply@hostea.org"
|
||||||
|
|
|
@ -170,7 +170,6 @@ PAYMENT_VARIANTS = {
|
||||||
HOSTEA = {
|
HOSTEA = {
|
||||||
"SOURCE_CODE": "https://gitea.hostea.org/Hostea/dashboard",
|
"SOURCE_CODE": "https://gitea.hostea.org/Hostea/dashboard",
|
||||||
"RESTRICT_NEW_INTEGRATION_INSTALLATION": True,
|
"RESTRICT_NEW_INTEGRATION_INSTALLATION": True,
|
||||||
"EMAIL_SENDER_ADDRESS": "no-reply@hostea.org",
|
|
||||||
"INSTANCE_MAINTAINER_CONTACT": "contact@hostea.example.org",
|
"INSTANCE_MAINTAINER_CONTACT": "contact@hostea.example.org",
|
||||||
"ACCOUNTS": {
|
"ACCOUNTS": {
|
||||||
"MAX_VERIFICATION_TOLERANCE_PERIOD": 60 * 60 * 24, # in seconds
|
"MAX_VERIFICATION_TOLERANCE_PERIOD": 60 * 60 * 24, # in seconds
|
||||||
|
@ -204,6 +203,7 @@ EMAIL_USE_SSL = False
|
||||||
EMAIL_PORT = 10025
|
EMAIL_PORT = 10025
|
||||||
EMAIL_HOST_USER = "admin"
|
EMAIL_HOST_USER = "admin"
|
||||||
EMAIL_HOST_PASSWORD = "password"
|
EMAIL_HOST_PASSWORD = "password"
|
||||||
|
DEFAULT_FROM_EMAIL: "no-reply@hostea.org"
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from dashboard.local_settings import *
|
from dashboard.local_settings import *
|
||||||
|
|
|
@ -64,7 +64,7 @@ class Worker(Thread):
|
||||||
context=ctx,
|
context=ctx,
|
||||||
)
|
)
|
||||||
|
|
||||||
sender = settings.HOSTEA["EMAIL_SENDER_ADDRESS"]
|
sender = settings.DEFAULT_FROM_EMAIL
|
||||||
|
|
||||||
send_mail(
|
send_mail(
|
||||||
subject="[Hostea] Your Hostea instance is now online!",
|
subject="[Hostea] Your Hostea instance is now online!",
|
||||||
|
|
|
@ -66,7 +66,7 @@ def create_instance(request, instance_name: str):
|
||||||
context=ctx,
|
context=ctx,
|
||||||
)
|
)
|
||||||
|
|
||||||
sender = settings.HOSTEA["EMAIL_SENDER_ADDRESS"]
|
sender = settings.DEFAULT_FROM_EMAIL
|
||||||
|
|
||||||
send_mail(
|
send_mail(
|
||||||
subject="[Hostea] Your Hostea instance is now online!",
|
subject="[Hostea] Your Hostea instance is now online!",
|
||||||
|
|
Loading…
Reference in New Issue