Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
kszkepzes-backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
JetBrains YouTrack
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
KSZK
DevTeam
kszkepzes
old
kszkepzes-backend
Commits
39811ad1
Verified
Commit
39811ad1
authored
3 years ago
by
Rafael László
Browse files
Options
Downloads
Patches
Plain Diff
Add mail env vars
parent
c3675e2a
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/common/email.py
+13
-12
13 additions, 12 deletions
src/common/email.py
src/kszkepzes/settings/production.py
+4
-1
4 additions, 1 deletion
src/kszkepzes/settings/production.py
with
17 additions
and
13 deletions
src/common/email.py
+
13
−
12
View file @
39811ad1
import
os
from
django.core.mail
import
send_mail
import
codecs
import
sys
sender_email
=
'
noreply@ujonc.
kszk.bme.hu
'
link
=
'
https://ujonc.kszk.bme.hu/homework
'
SENDER_EMAIL
=
os
.
getenv
(
'
SENDER_MAIL
'
,
'
kepzes@
kszk.bme.hu
'
)
HOMEWORK_LINK
=
os
.
getenv
(
'
HOMEWORK_LINK
'
,
'
https://ujonc.kszk.bme.hu/homework
'
)
def
get_full_name
(
user
):
...
...
@@ -16,19 +17,19 @@ def read_email(name):
return
data
def
send_out_mail
(
subject
,
message
,
sender_email
,
receiver_email
):
def
send_out_mail
(
subject
,
message
,
SENDER_EMAIL
,
receiver_email
):
if
'
runserver
'
in
sys
.
argv
:
# It is in development
print
(
"
Email sent from:
"
+
str
(
sender_email
)
+
"
to:
"
+
str
(
receiver_email
))
print
(
"
Email sent from:
"
+
str
(
SENDER_EMAIL
)
+
"
to:
"
+
str
(
receiver_email
))
else
:
send_mail
(
subject
,
message
,
sender_email
,
[
receiver_email
,
])
send_mail
(
subject
,
message
,
SENDER_EMAIL
,
[
receiver_email
,
])
def
registration
(
user
):
subject
=
"
Kszképzés regisztráció
"
message
=
read_email
(
'
registration.txt
'
)
message
=
str
.
format
(
message
%
{
'
name
'
:
get_full_name
(
user
)})
send_out_mail
(
subject
,
message
,
sender_email
,
[
user
.
email
,
])
send_out_mail
(
subject
,
message
,
SENDER_EMAIL
,
[
user
.
email
,
])
pass
...
...
@@ -36,7 +37,7 @@ def admitted(user):
subject
=
"
Jelentkezés eredménye
"
message
=
read_email
(
'
admitted.txt
'
)
message
=
str
.
format
(
message
%
{
'
name
'
:
get_full_name
(
user
)})
send_out_mail
(
subject
,
message
,
sender_email
,
[
user
.
email
,
])
send_out_mail
(
subject
,
message
,
SENDER_EMAIL
,
[
user
.
email
,
])
pass
...
...
@@ -44,7 +45,7 @@ def denied(user):
subject
=
"
Jelentkezés eredménye
"
message
=
read_email
(
'
denied.txt
'
)
message
=
str
.
format
(
message
%
{
'
name
'
:
get_full_name
(
user
)})
send_out_mail
(
subject
,
message
,
sender_email
,
[
user
.
email
,
])
send_out_mail
(
subject
,
message
,
SENDER_EMAIL
,
[
user
.
email
,
])
pass
...
...
@@ -53,8 +54,8 @@ def new_homework(user, deadline):
subject
=
"
Új házifeladat
"
message
=
read_email
(
'
new_homework.txt
'
)
message
=
str
.
format
(
message
%
{
'
name
'
:
get_full_name
(
user
),
'
link
'
:
link
,
'
deadline
'
:
deadline
})
send_out_mail
(
subject
,
message
,
sender_email
,
[
user
.
email
,
])
message
%
{
'
name
'
:
get_full_name
(
user
),
'
link
'
:
HOMEWORK_LINK
,
'
deadline
'
:
deadline
})
send_out_mail
(
subject
,
message
,
SENDER_EMAIL
,
[
user
.
email
,
])
pass
...
...
@@ -66,8 +67,8 @@ def homework_corrected(user, title, accepted):
status
=
'
Hibás
'
message
=
read_email
(
'
homework_corrected.txt
'
)
message
=
str
.
format
(
message
%
{
'
name
'
:
get_full_name
(
user
),
'
link
'
:
link
,
'
link
'
:
HOMEWORK_LINK
,
'
status
'
:
status
,
'
title
'
:
title
})
send_out_mail
(
subject
,
message
,
sender_email
,
[
user
.
email
,
])
send_out_mail
(
subject
,
message
,
SENDER_EMAIL
,
[
user
.
email
,
])
pass
This diff is collapsed.
Click to expand it.
src/kszkepzes/settings/production.py
+
4
−
1
View file @
39811ad1
...
...
@@ -26,4 +26,7 @@ REST_FRAMEWORK = {
EMAIL_BACKEND
=
'
django.core.mail.backends.smtp.EmailBackend
'
EMAIL_HOST
=
'
mail.sch.bme.hu
'
EMAIL_PORT
=
25
EMAIL_PORT
=
587
EMAIL_USE_TLS
=
True
EMAIL_HOST_USER
=
os
.
getenv
(
'
SMTP_USER
'
)
EMAIL_HOST_PASSWORD
=
os
.
getenv
(
'
SMTP_PASSWORD
'
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment