ifiguero
/
pysmtp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Limpieza de codigo innecesario

master
ifiguero 2022-01-21 21:08:47 -03:00
parent c2ec57b09a
commit b363e7f791
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mayordomo/__init__.py
View File

@ -18,9 +18,9 @@ from .resolver import updateDNS
smtprelayport = '10025' smtprelayport = '10025'
bindip = '0.0.0.0' bindip = '0.0.0.0'
cacerts = '/etc/ssl/certs/ca-certificates.crt' # cacerts = '/etc/ssl/certs/ca-certificates.crt'
keyfile = '/var/run/secrets/keyfile' # keyfile = '/var/run/secrets/keyfile'
certfile = '/var/run/secrets/certfile' # certfile = '/var/run/secrets/certfile'
if not os.environ.get('SMTP_HOSTNAME'): if not os.environ.get('SMTP_HOSTNAME'):
banner_hostname = 'midominio.cl' banner_hostname = 'midominio.cl'
@ -47,7 +47,7 @@ async def enviarCorreosDominio(dominioid):
try: try:
conectado = False conectado = False
try: try:
smtp = aiosmtplib.SMTP(hostname=str(dbdireccion.ipaddr), source_address=banner_hostname, port=25, start_tls=True, use_tls=False, validate_certs=False, timeout=10) smtp = aiosmtplib.SMTP(hostname=str(dbdireccion.ipaddr), source_address=banner_hostname, port=25, start_tls=True, use_tls=False, validate_certs=False, timeout=10)
await smtp.connect() await smtp.connect()
conectado = True conectado = True
await log.debug('Conectado a START_TLS: 25 {}'.format(dbdireccion.ipaddr)) await log.debug('Conectado a START_TLS: 25 {}'.format(dbdireccion.ipaddr))
@ -57,7 +57,7 @@ async def enviarCorreosDominio(dominioid):
if conectado == False: if conectado == False:
try: try:
smtp = aiosmtplib.SMTP(hostname=str(dbdireccion.ipaddr), source_address=banner_hostname, port=465, use_tls=True, validate_certs=False, client_cert=certfile, client_key=keyfile, cert_bundle=cacerts, timeout=10) smtp = aiosmtplib.SMTP(hostname=str(dbdireccion.ipaddr), source_address=banner_hostname, port=465, use_tls=True, validate_certs=False, timeout=10)
await smtp.connect() await smtp.connect()
conectado = True conectado = True
await log.debug('Conectado a USE_TLS 456: {}'.format(dbdireccion.ipaddr)) await log.debug('Conectado a USE_TLS 456: {}'.format(dbdireccion.ipaddr))
@ -67,7 +67,7 @@ async def enviarCorreosDominio(dominioid):
if conectado == False: if conectado == False:
try: try:
smtp = aiosmtplib.SMTP(hostname=str(dbdireccion.ipaddr), source_address=banner_hostname, port=587, start_tls=True, validate_certs=False, client_cert=certfile, client_key=keyfile, cert_bundle=cacerts, timeout=10) smtp = aiosmtplib.SMTP(hostname=str(dbdireccion.ipaddr), source_address=banner_hostname, port=587, start_tls=True, validate_certs=False, timeout=10)
await smtp.connect() await smtp.connect()
conectado = True conectado = True
await log.debug('Conectado a START_TLS 587: {}'.format(dbdireccion.ipaddr)) await log.debug('Conectado a START_TLS 587: {}'.format(dbdireccion.ipaddr))