Merge branch 'master' into Develop

# Conflicts: # cps/templates/layout.html # cps/web.py # readme.md
2019-02-16 10:17:46 +01:00
parent 4230226716 56826f67fc
commit 37007dafee
14 changed files with 282 additions and 435 deletions
@@ -71,7 +71,12 @@ MATURE_CONTENT = 2048
 SIDEBAR_PUBLISHER = 4096

 DEFAULT_PASS = "admin123"
-DEFAULT_PORT = int(os.environ.get("CALIBRE_PORT", 8083))
+try:
+    DEFAULT_PORT = int(os.environ.get("CALIBRE_PORT", 8083))
+except ValueError:
+    print ('Environmentvariable CALIBRE_PORT is set to an invalid value: ' +
+           os.environ.get("CALIBRE_PORT", 8083) + ', faling back to default (8083)')
+    DEFAULT_PORT = 8083

 UPDATE_STABLE = 0
 AUTO_UPDATE_STABLE = 1