diff --git a/maloja/__pkginfo__.py b/maloja/__pkginfo__.py index 6f1ee03..7fc519b 100644 --- a/maloja/__pkginfo__.py +++ b/maloja/__pkginfo__.py @@ -5,7 +5,7 @@ author = { "email":"maloja@dev.krateng.ch", "github": "krateng" } -version = 2,13,1 +version = 2,13,2 versionstr = ".".join(str(n) for n in version) links = { "pypi":"malojaserver", diff --git a/maloja/proccontrol/control.py b/maloja/proccontrol/control.py index 2a4b648..2aa9554 100644 --- a/maloja/proccontrol/control.py +++ b/maloja/proccontrol/control.py @@ -47,7 +47,7 @@ def start(): sp = subprocess.Popen(["python3","-m","maloja.proccontrol.supervisor"],stdout=subprocess.DEVNULL,stderr=subprocess.DEVNULL) print(col["green"]("Maloja started!")) - port = malojaconfig["WEB_PORT"] + port = malojaconfig["PORT"] print("Visit your server address (Port " + str(port) + ") to see your web interface. Visit /admin_setup to get started.") print("If you're installing this on your local machine, these links should get you there:") diff --git a/maloja/server.py b/maloja/server.py index 6473d92..e59924b 100644 --- a/maloja/server.py +++ b/maloja/server.py @@ -181,8 +181,6 @@ def dynamic_image(): @webserver.route("/images/") @webserver.route("/images/") def static_image(pth): - if globalconf.USE_THUMBOR: - return static_file(pth,root=data_dir['images']()) type = pth.split(".")[-1] small_pth = pth + "-small"