aljaz/CTFd
1
0
Fork 0
mirror of https://github.com/aljazceru/CTFd.git synced 2025-12-17 14:04:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate Mailgun integration. Works on #1432

Browse Source
This commit is contained in:
Kevin Chung
2020-06-28 23:59:07 -04:00
parent 96ecdedfdf
commit b247b1eb47
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CTFd/config.py
View File

@@ -143,10 +143,12 @@ class Config(object):
Whether to connect to the SMTP server over SSL Whether to connect to the SMTP server over SSL
MAILGUN_API_KEY MAILGUN_API_KEY
Mailgun API key to send email over Mailgun Mailgun API key to send email over Mailgun. As of CTFd v3, Mailgun integration is deprecated.
Installations using the Mailgun API should migrate over to SMTP settings.
MAILGUN_BASE_URL MAILGUN_BASE_URL
Mailgun base url to send email over Mailgun Mailgun base url to send email over Mailgun. As of CTFd v3, Mailgun integration is deprecated.
Installations using the Mailgun API should migrate over to SMTP settings.
""" """
MAILFROM_ADDR = os.getenv("MAILFROM_ADDR") or "noreply@ctfd.io" MAILFROM_ADDR = os.getenv("MAILFROM_ADDR") or "noreply@ctfd.io"
MAIL_SERVER = os.getenv("MAIL_SERVER") or None MAIL_SERVER = os.getenv("MAIL_SERVER") or None

3
CTFd/themes/admin/templates/configs/email.html
View File

@@ -232,6 +232,9 @@
</div> </div>
</div> </div>
<div role="tabpanel" class="tab-pane" id="mailgun"> <div role="tabpanel" class="tab-pane" id="mailgun">
<div class="alert alert-warning" role="alert">
Mailgun integration is deprecated! Please see your Mailgun account for SMTP credentials.
</div>
<div class="form-group"> <div class="form-group">
<label> <label>
Mailgun API Base URL<br> Mailgun API Base URL<br>

4
docs/configuration.rst
View File

@@ -69,11 +69,11 @@ Whether to connect to the SMTP server over SSL
MAILGUN_API_KEY MAILGUN_API_KEY
~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~
Mailgun API key to send email over Mailgun Mailgun API key to send email over Mailgun. As of CTFd v3, Mailgun integration is deprecated. Installations using the Mailgun API should migrate over to SMTP settings.
MAILGUN_BASE_URL MAILGUN_BASE_URL
~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~
Mailgun base url to send email over Mailgun Mailgun base url to send email over Mailgun. As of CTFd v3, Mailgun integration is deprecated. Installations using the Mailgun API should migrate over to SMTP settings.
LOG_FOLDER LOG_FOLDER
~~~~~~~~~~ ~~~~~~~~~~