reflect security = ... in docs and print warning if used

This commit is contained in:
Martin Zimmermann 2014-01-01 22:20:00 +01:00
parent c50fe22eb1
commit 9dd066c6a6
3 changed files with 14 additions and 12 deletions

View File

@ -157,7 +157,7 @@ also can moderate (=activate or delete) comments. Don't forget to configure
password = password =
host = localhost host = localhost
port = 465 port = 465
ssl = on security = ssl
to = to =
from = from =
@ -174,10 +174,10 @@ host
port port
SMTP port SMTP port
ssl security
use SSL to connect to the server. Python probably does not validate the use a secure connection to the server, possible values: *none*, *starttls*
certificate. Needs research, though. But you should use a dedicated or *ssl*. Python 2.X probably does not validate certificates (needs
email account anyways. research). But you should use a dedicated email account anyways.
to to
recipient address, e.g. your email address recipient address, e.g. your email address

View File

@ -80,10 +80,10 @@ host = localhost
# SMTP port # SMTP port
port = 465 port = 465
# use SSL to connect to the server. Python probably does not validate the # use a secure connection to the server, possible values: "none", "starttls"
# certificate. Needs research, though. But you should use a dedicated email # or "ssl". Python 2.X probably does not validate certificates (needs
# account anyways. # research). But you should use a dedicated email account anyways.
ssl = on security = ssl
# recipient address, e.g. your email address # recipient address, e.g. your email address
to = to =

View File

@ -148,6 +148,8 @@ class Config:
logger.warn("no such option: [%s] %s", *item) logger.warn("no such option: [%s] %s", *item)
if item in (("server", "host"), ("server", "port")): if item in (("server", "host"), ("server", "port")):
logger.warn("use `listen = http://$host:$port` instead") logger.warn("use `listen = http://$host:$port` instead")
if item == ("smtp", "ssl"):
logger.warn("use `security = none | starttls | ssl` instead")
if rv.get("smtp", "username") and not rv.get("general", "notify"): if rv.get("smtp", "username") and not rv.get("general", "notify"):
logger.warn(("SMTP is no longer enabled by default, add " logger.warn(("SMTP is no longer enabled by default, add "