Author: andar
Revision: 4963
Log:
Fix #870 use proper config location for loading ssl cert
Diff:
Modified: branches/1.1.0_RC/ChangeLog
===================================================================
--- branches/1.1.0_RC/ChangeLog 2009-03-31 18:26:40 UTC (rev 4962)
+++ branches/1.1.0_RC/ChangeLog 2009-03-31 18:42:10 UTC (rev 4963)
@@ -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
Modified: branches/1.1.0_RC/deluge/ui/webui/deluge_webserver.py
===================================================================
--- branches/1.1.0_RC/deluge/ui/webui/deluge_webserver.py 2009-03-31
18:26:40 UTC (rev 4962)
+++ branches/1.1.0_RC/deluge/ui/webui/deluge_webserver.py 2009-03-31
18:42:10 UTC (rev 4963)
@@ -25,6 +25,7 @@
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 @@
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
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"deluge-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/deluge-commit?hl=en
-~----------~----~----~----~------~----~------~--~---
