summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Simonis <christophe@cobalt>2008-12-23 12:31:00 +0100
committerChristophe Simonis <christophe@cobalt>2008-12-23 12:31:00 +0100
commitf4a6b51fb46c8a948ccc641324ec37dc1a4d6bb2 (patch)
tree8d65bbecde26eebeae3b53031db4e3094c92c24a
parent704370d9b3bae14444db4ffa79da9bf1019db4a0 (diff)
[FIX] smtp_ssl option is only get when ssl is available
bzr revid: christophe@cobalt-20081223113100-xtyp5vbrdj1ic9vg
-rw-r--r--bin/tools/config.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/tools/config.py b/bin/tools/config.py
index 72725d51051..3717f0b6a5e 100644
--- a/bin/tools/config.py
+++ b/bin/tools/config.py
@@ -189,12 +189,12 @@ class configmanager(object):
self.options['pidfile'] = False
keys = ['interface', 'port', 'db_name', 'db_user', 'db_password', 'db_host',
- 'db_port', 'logfile', 'pidfile', 'smtp_ssl', 'smtp_port',
+ 'db_port', 'logfile', 'pidfile', 'smtp_port',
'email_from', 'smtp_server', 'smtp_user', 'smtp_password', 'price_accuracy',
'netinterface', 'netport', 'db_maxconn', 'import_partial', 'addons_path']
if hasSSL:
- keys.extend(['secure_cert_file', 'secure_pkey_file'])
+ keys.extend(['smtp_ssl', 'secure_cert_file', 'secure_pkey_file'])
for arg in keys:
if getattr(opt, arg):