diff options
| -rwxr-xr-x | pyload/Core.py | 4 | ||||
| -rw-r--r-- | pyload/config/Setup.py | 8 | ||||
| -rw-r--r-- | pyload/config/default.conf | 2 | ||||
| -rw-r--r-- | pyload/manager/thread/Server.py | 10 | ||||
| -rw-r--r-- | pyload/webui/__init__.py | 4 |
5 files changed, 14 insertions, 14 deletions
diff --git a/pyload/Core.py b/pyload/Core.py index 9588c9485..0cc10df6e 100755 --- a/pyload/Core.py +++ b/pyload/Core.py @@ -444,7 +444,7 @@ class Core(object): self.db.manager = self.files #ugly? def init_webserver(self): - if self.config['webinterface']['activated']: + if self.config['webui']['activated']: self.webserver = WebServer(self) self.webserver.start() @@ -547,7 +547,7 @@ class Core(object): def shutdown(self): self.log.info(_("shutting down...")) try: - if self.config['webinterface']['activated'] and hasattr(self, "webserver"): + if self.config['webui']['activated'] and hasattr(self, "webserver"): self.webserver.quit() for thread in list(self.threadManager.threads): diff --git a/pyload/config/Setup.py b/pyload/config/Setup.py index 081184652..7f5c0b0ed 100644 --- a/pyload/config/Setup.py +++ b/pyload/config/Setup.py @@ -326,8 +326,8 @@ class SetupAssistant(object): print print _("Listen address, if you use 127.0.0.1 or localhost, the webinterface will only accessible locally.") - self.config.set("webinterface", "host", self.ask(_("Address"), "0.0.0.0")) - self.config.set("webinterface", "port", self.ask(_("Port"), "8000")) + self.config.set("webui", "host", self.ask(_("Address"), "0.0.0.0")) + self.config.set("webui", "port", self.ask(_("Port"), "8000")) print print _("pyLoad offers several server backends, now following a short explanation.") print "- auto:", _("Automatically choose the best webserver for your platform.") @@ -347,7 +347,7 @@ class SetupAssistant(object): else: servers = ["auto", "builtin", "threaded", "fastcgi", "lightweight"] - self.config.set("webinterface", "server", self.ask(_("Choose webserver"), "auto", servers)) + self.config.set("webui", "server", self.ask(_("Choose webserver"), "auto", servers)) def conf_ssl(self): @@ -363,7 +363,7 @@ class SetupAssistant(object): ssl = self.ask(_("Activate SSL?"), self.yes, bool=True) self.config.set("remote", "ssl", ssl) - self.config.set("webinterface", "ssl", ssl) + self.config.set("webui", "ssl", ssl) def set_user(self): diff --git a/pyload/config/default.conf b/pyload/config/default.conf index cfbd25968..d4b3fd493 100644 --- a/pyload/config/default.conf +++ b/pyload/config/default.conf @@ -9,7 +9,7 @@ ssl - "SSL": bool activated : "Activated"= False file cert : "SSL Certificate" = ssl.crt file key : "SSL Key" = ssl.key -webinterface - "Web UI": +webui - "Web UI": bool activated : "Activated" = True builtin;threaded;fastcgi;lightweight server : "Server" = builtin bool https : "Use HTTPS" = False diff --git a/pyload/manager/thread/Server.py b/pyload/manager/thread/Server.py index 76b9efda8..5962981e8 100644 --- a/pyload/manager/thread/Server.py +++ b/pyload/manager/thread/Server.py @@ -20,12 +20,12 @@ class WebServer(threading.Thread): self.core = pycore core = pycore self.running = True - self.server = pycore.config['webinterface']['server'] - self.https = pycore.config['webinterface']['https'] + self.server = pycore.config['webui']['server'] + self.https = pycore.config['webui']['https'] self.cert = pycore.config["ssl"]["cert"] self.key = pycore.config["ssl"]["key"] - self.host = pycore.config['webinterface']['host'] - self.port = pycore.config['webinterface']['port'] + self.host = pycore.config['webui']['host'] + self.port = pycore.config['webui']['port'] self.setDaemon(True) @@ -66,7 +66,7 @@ class WebServer(threading.Thread): self.server = "builtin" else: self.core.log.info(_("Server set to threaded, due to known performance problems on windows.")) - self.core.config['webinterface']['server'] = "threaded" + self.core.config['webui']['server'] = "threaded" self.server = "threaded" if self.server == "threaded": diff --git a/pyload/webui/__init__.py b/pyload/webui/__init__.py index 1310c629d..d965db3a0 100644 --- a/pyload/webui/__init__.py +++ b/pyload/webui/__init__.py @@ -39,10 +39,10 @@ else: config = Server.core.config JS = JsEngine(Server.core) -THEME = config.get('webinterface', 'theme') +THEME = config.get('webui', 'theme') DL_ROOT = config.get('general', 'download_folder') LOG_ROOT = config.get('log', 'log_folder') -PREFIX = config.get('webinterface', 'prefix') +PREFIX = config.get('webui', 'prefix') if PREFIX: PREFIX = PREFIX.rstrip("/") |