From 8d9ed5686467f83ec532a2e4064fa15603a02313 Mon Sep 17 00:00:00 2001 From: janeczku Date: Mon, 6 Feb 2017 15:28:40 +0100 Subject: [PATCH 1/2] Fix typo; raise exception when creating database --- cps/ub.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cps/ub.py b/cps/ub.py index 106cacbf..dc86a257 100644 --- a/cps/ub.py +++ b/cps/ub.py @@ -419,7 +419,7 @@ def create_admin_user(): user.nickname = "admin" user.role = ROLE_USER + ROLE_ADMIN + ROLE_DOWNLOAD + ROLE_UPLOAD + ROLE_EDIT + ROLE_PASSWD user.sidebar_view = DETAIL_RANDOM + SIDEBAR_LANGUAGE + SIDEBAR_SERIES + SIDEBAR_CATEGORY + SIDEBAR_HOT + \ - SIDEBAR_RANDOM + SIDEBAR_AUTHOR + SIEDBAR_BEST_RATED + SIDEBAR_RANDOM + SIDEBAR_AUTHOR + SIDEBAR_BEST_RATED user.password = generate_password_hash(DEFAULT_PASS) @@ -444,7 +444,7 @@ if not os.path.exists(dbpath): create_admin_user() create_anonymous_user() except Exception: - pass + raise else: migrate_Database() From 0e883f0b468ce5a0fc57eebcc6882ddd412308fd Mon Sep 17 00:00:00 2001 From: janeczku Date: Mon, 6 Feb 2017 16:00:29 +0100 Subject: [PATCH 2/2] Allow overriding default port with environment variable --- cps/ub.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cps/ub.py b/cps/ub.py index 106cacbf..f456d281 100644 --- a/cps/ub.py +++ b/cps/ub.py @@ -34,6 +34,7 @@ SIDEBAR_AUTHOR = 64 SIDEBAR_BEST_RATED = 128 DEFAULT_PASS = "admin123" +DEFAULT_PORT = int(os.environ.get("CALIBRE_PORT", 8083)) @@ -252,7 +253,7 @@ class Settings(Base): mail_password = Column(String) mail_from = Column(String) config_calibre_dir = Column(String) - config_port = Column(Integer, default=8083) + config_port = Column(Integer, default=DEFAULT_PORT) config_calibre_web_title = Column(String, default=u'Calibre-web') config_books_per_page = Column(Integer, default=60) config_random_books = Column(Integer, default=4)