summaryrefslogtreecommitdiffstats
path: root/pyload/config
diff options
context:
space:
mode:
authorGravatar Armin <Armin@Armin-PC.diedering.lan> 2015-04-08 21:49:45 +0200
committerGravatar Armin <Armin@Armin-PC.diedering.lan> 2015-04-08 21:49:45 +0200
commitc19e6e249c839d127d2cd6ae70ec5be909b2184e (patch)
tree97de200f5430c80bb2f22ba6c92e450e50acf369 /pyload/config
parentfix setup (diff)
parentMerge pull request #1 from vuolter/0.4.10 (diff)
downloadpyload-c19e6e249c839d127d2cd6ae70ec5be909b2184e.tar.xz
Merge remote-tracking branch 'origin/0.4.10' into 0.4.10
Diffstat (limited to 'pyload/config')
-rw-r--r--pyload/config/Setup.py8
-rw-r--r--pyload/config/default.conf2
2 files changed, 5 insertions, 5 deletions
diff --git a/pyload/config/Setup.py b/pyload/config/Setup.py
index 835a2978b..3ce35bfe1 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