use port 465 for smtps
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Max Erenberg 2021-11-02 02:23:37 -04:00
parent f9f5d70ad3
commit 1f107b0614
4 changed files with 14 additions and 3 deletions

View File

@ -1 +1 @@
1.0.4 1.0.5

View File

@ -24,7 +24,12 @@ class MailService:
raise Exception('Invalid SMTP URL: %s' % smtp_url) raise Exception('Invalid SMTP URL: %s' % smtp_url)
self.smtps = match.group('scheme') == 'smtps' self.smtps = match.group('scheme') == 'smtps'
self.host = match.group('host') self.host = match.group('host')
self.port = int(match.group('port') or 25) if match.group('port') is not None:
self.port = int(match.group('port'))
elif self.smtps:
self.port = 465
else:
self.port = 25
self.starttls = cfg.get('mail_smtp_starttls') self.starttls = cfg.get('mail_smtp_starttls')
assert not (self.smtps and self.starttls) assert not (self.smtps and self.starttls)
self.base_domain = cfg.get('base_domain') self.base_domain = cfg.get('base_domain')

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
ceo (1.0.5-buster1) buster; urgency=medium
* Use port 465 for smtps.
-- Max Erenberg <merenber@csclub.uwaterloo.ca> Tue, 02 Nov 2021 06:22:24 +0000
ceo (1.0.4-buster1) buster; urgency=high ceo (1.0.4-buster1) buster; urgency=high
* Use pip install . instead of python setup.py install * Use pip install . instead of python setup.py install

View File

@ -22,7 +22,7 @@ setup(
], ],
license='MIT', license='MIT',
keywords='csc, syscom, admin, ldap, kerberos', keywords='csc, syscom, admin, ldap, kerberos',
packages=find_packages(), packages=find_packages(exclude=['tests.*', 'tests']),
python_requires='>=3.7', python_requires='>=3.7',
install_requires=requirements, install_requires=requirements,
tests_require=test_requirements, tests_require=test_requirements,