summaryrefslogtreecommitdiffstats
path: root/pyLoadCore.py
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2010-03-16 21:28:01 +0100
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2010-03-16 21:28:01 +0100
commit7186f5cc9f502cbdaf1245a2820a7dfb434f4e49 (patch)
tree7fbf10131925cfe399063c8e923240d1afadd42a /pyLoadCore.py
parentFixed Hotfile (diff)
downloadpyload-7186f5cc9f502cbdaf1245a2820a7dfb434f4e49.tar.xz
core ssl fix, nginx support, https for lighttpd and nginx
Diffstat (limited to 'pyLoadCore.py')
-rw-r--r--pyLoadCore.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/pyLoadCore.py b/pyLoadCore.py
index bcc88814b..9501631f8 100644
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -113,7 +113,10 @@ class Core(object):
self.config['general']['debug_mode'] = True
self.parser_plugins = XMLConfigParser(self.make_path("module", "config", "plugin.xml"))
#~ self.config_plugins = self.parser_plugins.getConfig()
-
+
+ self.config['ssl']['cert'] = self.make_path(self.config['ssl']['cert'])
+ self.config['ssl']['key'] = self.make_path(self.config['ssl']['key'])
+
self.do_kill = False
self.do_restart = False
translation = gettext.translation("pyLoad", self.make_path("locale"), languages=[self.config['general']['language']])
@@ -394,7 +397,7 @@ class Core(object):
return False
def make_path(self, * args):
- if isabs(args[0]):
+ if isabs(args[0]):
return args[0]
else:
return join(self.path, * args)