use ALINTO smtp relay for production

This commit is contained in:
2021-07-24 16:14:28 +02:00
parent 9cd021f474
commit 5b8c73caea
6 changed files with 14 additions and 15 deletions

View File

@@ -30,14 +30,12 @@ mondumas.devfac_dir = /DEVFAC14/DOCS_ATTACHES
# Mailer configuration # Mailer configuration
mail.host = smtp.orange.fr mail.host = smtp.orange.fr
mail.port = 25 mail.port = 25
mail.username = cao.thien-phuoc@orange.fr
# SMTP alinto quota limit 30 emails # SMTP RELAY alinto
# mail.host = v5.alinto.net # mail.host = gatewayxl.alinto.net
# mail.port = 465 # mail.port = 465
# mail.ssl = True # mail.ssl = True
# ATTENTION : mail.username est utilisé dans rdf_view # mail.username = smtpsasdumas@entreprise-dumas.com
# mail.username = polynet-dumas@entreprise-dumas.com
# mail.password = sasdumas
[server:main] [server:main]
use = egg:waitress#main use = egg:waitress#main

View File

@@ -49,7 +49,7 @@
<td style="width:18%; text-align:right">Montant HT</td> <td style="width:18%; text-align:right">Montant HT</td>
</tr> </tr>
<tr> <tr>
<td colspan="4"><hr></td> <td colspan="5"><hr></td>
</tr> </tr>
<!-- clignes de détail du devis --> <!-- clignes de détail du devis -->
<div tal:replace="structure dt_html">Les lignes du devis ici</div> <div tal:replace="structure dt_html">Les lignes du devis ici</div>

View File

@@ -184,7 +184,7 @@ def devis_web(request):
os.remove(dest) os.remove(dest)
# on est en developpement ou en production # on est en developpement ou en production
if request.registry.settings["mail.username"] == "sasdumas@entreprise-dumas.com": if request.registry.settings["mondumas.admin_email"] == "sasdumas@entreprise-dumas.com":
origin = 'https://gestion.entreprise-dumas.com/devis_preview/%s' % nodevis origin = 'https://gestion.entreprise-dumas.com/devis_preview/%s' % nodevis
pdfkit.from_url(origin, dest, options=options) pdfkit.from_url(origin, dest, options=options)
else: else:

View File

@@ -651,7 +651,7 @@ def rdf_view(request):
os.remove(dest) os.remove(dest)
# developpement ou production # developpement ou production
if request.registry.settings["mail.username"].find('@entreprise-dumas.com') > 0: if request.registry.settings["mondumas.admin_email"].find('@entreprise-dumas.com') > 0:
origin = 'https://gestion.entreprise-dumas.com/rdf_rapport/%s' % norapport origin = 'https://gestion.entreprise-dumas.com/rdf_rapport/%s' % norapport
pdfkit.from_url(origin, dest, options=options) pdfkit.from_url(origin, dest, options=options)
else: else:

View File

@@ -165,7 +165,7 @@ def send_mail(request, expediteur, destinataires, objet, corps):
recipients=destinataires, recipients=destinataires,
html=body) html=body)
mailer = get_mailer(request) mailer = get_mailer(request)
# import pdb;pdb.set_trace() import pdb;pdb.set_trace()
msg = '' msg = ''
try: try:
mailer.send_immediately(message) mailer.send_immediately(message)

View File

@@ -28,14 +28,15 @@ mondumas.devfac_dir = /DEVFAC14/DOCS_ATTACHES
# mail.host = mail1.sfrbusinessteam.fr # mail.host = mail1.sfrbusinessteam.fr
# mail.port = 25 # mail.port = 25
# mail.ssl = False # mail.ssl = False
# SMTP alinto quota limit 30 emails
mail.host = v5.alinto.net # SMTP RELAY alinto
mail.host = gatewayxl.alinto.net
mail.port = 465 mail.port = 465
mail.ssl = True mail.ssl = True
# ATTENTION : mail.username est utilisé dans rdf_view mail.username = smtpsasdumas@entreprise-dumas.com
mail.username = peinture-dumas@entreprise-dumas.com
mail.password = S@sdumas69 mail.password = S@sdumas69
[server:main] [server:main]
use = egg:waitress#main use = egg:waitress#main
host = 0.0.0.0 host = 0.0.0.0