1
0
mirror of https://github.com/krateng/maloja.git synced 2023-08-10 21:12:55 +03:00
This commit is contained in:
krateng 2021-12-22 05:44:16 +01:00
parent cefed03bc9
commit 0f5ccd4645
3 changed files with 2 additions and 4 deletions

View File

@ -5,7 +5,7 @@ author = {
"email":"maloja@dev.krateng.ch", "email":"maloja@dev.krateng.ch",
"github": "krateng" "github": "krateng"
} }
version = 2,13,1 version = 2,13,2
versionstr = ".".join(str(n) for n in version) versionstr = ".".join(str(n) for n in version)
links = { links = {
"pypi":"malojaserver", "pypi":"malojaserver",

View File

@ -47,7 +47,7 @@ def start():
sp = subprocess.Popen(["python3","-m","maloja.proccontrol.supervisor"],stdout=subprocess.DEVNULL,stderr=subprocess.DEVNULL) sp = subprocess.Popen(["python3","-m","maloja.proccontrol.supervisor"],stdout=subprocess.DEVNULL,stderr=subprocess.DEVNULL)
print(col["green"]("Maloja started!")) 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("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:") print("If you're installing this on your local machine, these links should get you there:")

View File

@ -181,8 +181,6 @@ def dynamic_image():
@webserver.route("/images/<pth:re:.*\\.png>") @webserver.route("/images/<pth:re:.*\\.png>")
@webserver.route("/images/<pth:re:.*\\.gif>") @webserver.route("/images/<pth:re:.*\\.gif>")
def static_image(pth): def static_image(pth):
if globalconf.USE_THUMBOR:
return static_file(pth,root=data_dir['images']())
type = pth.split(".")[-1] type = pth.split(".")[-1]
small_pth = pth + "-small" small_pth = pth + "-small"