diff options
author | Andrew Resch <andrewresch@gmail.com> | 2009-03-31 18:42:10 +0000 |
---|---|---|
committer | Andrew Resch <andrewresch@gmail.com> | 2009-03-31 18:42:10 +0000 |
commit | 8d8e1ef5c34d51119283bac3a729c2892e1c5c8b (patch) | |
tree | 5cd60b4f9849b08c7d52be2deda0fdac394c8da0 | |
parent | 1da46653e6bb1c42dfc5e816c222e3cf8f5dd618 (diff) | |
download | deluge-8d8e1ef5c34d51119283bac3a729c2892e1c5c8b.tar.gz deluge-8d8e1ef5c34d51119283bac3a729c2892e1c5c8b.tar.bz2 deluge-8d8e1ef5c34d51119283bac3a729c2892e1c5c8b.zip |
Fix #870 use proper config location for loading ssl cert
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | deluge/ui/webui/deluge_webserver.py | 6 |
2 files changed, 6 insertions, 3 deletions
@@ -4,6 +4,9 @@ * Fix #855 force a resume on a torrent if a 'Force Recheck' is initiated * Fix #862 deluged crash when access http://localhost:58846 +==== WebUI ==== + * Fix #870 use proper config location for loading ssl cert + === Deluge 1.1.5 - (16 March 2009) === ==== Core ==== * Fix config file saving when no current config file exists diff --git a/deluge/ui/webui/deluge_webserver.py b/deluge/ui/webui/deluge_webserver.py index 0beab9b52..051dad85b 100644 --- a/deluge/ui/webui/deluge_webserver.py +++ b/deluge/ui/webui/deluge_webserver.py @@ -25,6 +25,7 @@ import gettext import locale import deluge.common from deluge.configmanager import ConfigManager +import deluge.configmanager import pkg_resources from deluge.ui.client import sclient import components @@ -113,9 +114,8 @@ def create_webserver(debug = False, base_url =None): https = False if config["https"]: import os - from deluge.common import get_default_config_dir - cert_path = os.path.join(get_default_config_dir("ssl") ,"deluge.cert.pem" ) - key_path = os.path.join(get_default_config_dir("ssl") ,"deluge.key.pem" ) + cert_path = deluge.configmanager.get_config_dir("ssl/deluge.cert.pem") + key_path = deluge.configmanager.get_config_dir("ssl/deluge.key.pem") if os.path.exists (key_path) and os.path.exists (cert_path): server.ssl_certificate = cert_path server.ssl_private_key = key_path |