summaryrefslogtreecommitdiffstats
path: root/module/web
diff options
context:
space:
mode:
Diffstat (limited to 'module/web')
-rw-r--r--module/web/settings.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/module/web/settings.py b/module/web/settings.py
index 756554deb..515117860 100644
--- a/module/web/settings.py
+++ b/module/web/settings.py
@@ -24,9 +24,7 @@ sys.path.append(os.path.join(PYLOAD_DIR, "module"))
import InitHomeDir
sys.path.append(pypath)
-
-from module.ConfigParser import ConfigParser
-config = ConfigParser()
+config = None
#os.chdir(PROJECT_DIR) # UNCOMMENT FOR LOCALE GENERATION
#DEBUG = config.get("general","debug")
@@ -36,10 +34,14 @@ try:
if not module.web.ServerThread.core:
raise Exception
PYLOAD = module.web.ServerThread.core.server_methods
+ config = module.web.ServerThread.core.config
except:
import xmlrpclib
ssl = ""
+ from module.ConfigParser import ConfigParser
+ config = ConfigParser()
+
if config.get("ssl", "activated"):
ssl = "s"