diff options
| author | LV-426 <lv-426@taproot.org.il> | 2015-04-20 14:51:50 +0300 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2015-04-20 18:46:13 +0300 |
| commit | 6df5b5c2f50c6b839c3f8e98f5719a3a1d363b8a (patch) | |
| tree | 7a893e2a793cdcdc0307ae60b4b6c954cfdfb247 | |
| parent | b36543634af2fa5bef7252752016f0695a5dd1af (diff) | |
config: mta_host, mta_port
| -rw-r--r-- | res/etc/rhizi-server.conf.example | 3 | ||||
| -rw-r--r-- | src/server/rz_mail.py | 17 | ||||
| -rw-r--r-- | src/server/rz_server.py | 4 |
3 files changed, 15 insertions, 9 deletions
diff --git a/res/etc/rhizi-server.conf.example b/res/etc/rhizi-server.conf.example index 67d9863c..ba12c7ec 100644 --- a/res/etc/rhizi-server.conf.example +++ b/res/etc/rhizi-server.conf.example @@ -44,7 +44,8 @@ SECRET_KEY = notverysecretbutpeppyyaya # ----------------------------------------------------------------------------- # Mail # -mail_hostname = 127.0.0.1 +mta_host = 127.0.0.1 +mta_port = 127.0.0.1 mail_default_sender = rhizi@localhost feedback_recipient = feedback@localhost diff --git a/src/server/rz_mail.py b/src/server/rz_mail.py index ca575dee..82c71d8f 100644 --- a/src/server/rz_mail.py +++ b/src/server/rz_mail.py @@ -14,15 +14,20 @@ log = logging.getLogger('rhizi') def send_email_message(recipients, subject, body, attachments=[]): send_from = current_app.rz_config.mail_default_sender - smtp_hostname = current_app.rz_config.mail_hostname + mta_host = current_app.rz_config.mta_host + mta_port = current_app.rz_config.mta_port - send_message_helper(smtp_hostname=smtp_hostname, - send_from=send_from, recipients=recipients, - subject=subject, attachments=attachments, body=body) + send_message_helper(mta_host, + mta_port, + send_from=send_from, + recipients=recipients, + subject=subject, + attachments=attachments, + body=body) log.info('email sent: recipients: %s: subject: %s, attachment-count: %d' % (recipients, subject, len(attachments))) -def send_message_helper(smtp_hostname, send_from, recipients, subject, attachments, body): +def send_message_helper(mta_host, mta_port, send_from, recipients, subject, attachments, body): """ attachments is a list of tuples (filename, mimetype, data) @@ -47,7 +52,7 @@ def send_message_helper(smtp_hostname, send_from, recipients, subject, attachmen # Content_Disposition: attachment; filename="feedback_page.html" msg.attach(part) - smtp = smtplib.SMTP(smtp_hostname) + smtp = smtplib.SMTP(host=mta_host, port=mta_port) smtp.sendmail(send_from, recipients, msg.as_string()) smtp.close() diff --git a/src/server/rz_server.py b/src/server/rz_server.py index ee122887..89bdee48 100644 --- a/src/server/rz_server.py +++ b/src/server/rz_server.py @@ -61,8 +61,8 @@ class Config(object): cfg['optimized_main'] = False # Mail settings - cfg['mail_hostname'] = 'localhost' - cfg['mail_port'] = 25 + cfg['mta_host'] = '127.0.0.1' + cfg['mta_port'] = 25 # Network settings # - reverse_proxy_host: proxy host name as seen by clients |