Author: andar
Revision: 5623
Log:
Add a check_ssl_keys() function that will check for the keys and
generate them if needed
Diff:
Modified: trunk/deluge/core/rpcserver.py
===================================================================
--- trunk/deluge/core/rpcserver.py 2009-08-03 21:37:35 UTC (rev 5622)
+++ trunk/deluge/core/rpcserver.py 2009-08-03 21:39:06 UTC (rev 5623)
@@ -329,18 +329,9 @@
log.info("Starting DelugeRPC server %s:%s", hostname, port)
- # Check for SSL cert/key and create them if necessary
- ssl_dir = deluge.configmanager.get_config_dir("ssl")
- if not os.path.exists(ssl_dir):
- # The ssl folder doesn't exist so we need to create it
- os.makedirs(ssl_dir)
- generate_ssl_keys()
- else:
- for f in ("daemon.pkey", "daemon.cert"):
- if not os.path.exists(os.path.join(ssl_dir, f)):
- generate_ssl_keys()
- break
+ check_ssl_keys()
+
try:
reactor.listenSSL(port, self.factory, ServerContextFactory(),
interface=hostname)
except Exception, e:
@@ -403,6 +394,19 @@
(RPC_EVENT, event.name, event.args)
)
+def check_ssl_keys():
+ # Check for SSL cert/key and create them if necessary
+ ssl_dir = deluge.configmanager.get_config_dir("ssl")
+ if not os.path.exists(ssl_dir):
+ # The ssl folder doesn't exist so we need to create it
+ os.makedirs(ssl_dir)
+ generate_ssl_keys()
+ else:
+ for f in ("daemon.pkey", "daemon.cert"):
+ if not os.path.exists(os.path.join(ssl_dir, f)):
+ generate_ssl_keys()
+ break
+
def generate_ssl_keys():
"""
This method generates a new SSL key/cert.
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
