From 109b912e9943dd29fc447622839e46609967fa7f Mon Sep 17 00:00:00 2001
From: Benjamin Bertrand <benjamin.bertrand@esss.se>
Date: Fri, 30 Nov 2018 12:33:20 +0100
Subject: [PATCH] Fix WhiteNoise static directory
- flask-bootstrap dependency removed a while ago
- the full static directory shall be passed
JIRA INFRA-683
---
app/factory.py | 6 +-----
app/settings.py | 3 ++-
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/app/factory.py b/app/factory.py
index 576b59b..cd6ab2f 100644
--- a/app/factory.py
+++ b/app/factory.py
@@ -154,11 +154,7 @@ def create_app(config=None):
app.register_blueprint(network_api, url_prefix="/api/v1/network")
app.register_blueprint(rq_dashboard.blueprint, url_prefix="/rq")
- app.wsgi_app = WhiteNoise(app.wsgi_app, root="static/")
- app.wsgi_app.add_files(
- root="/opt/conda/envs/csentry/lib/python3.6/site-packages/flask_bootstrap/static/",
- prefix="bootstrap/",
- )
+ app.wsgi_app = WhiteNoise(app.wsgi_app, root=app.config["CSENTRY_STATIC_DIR"])
register_cli(app)
diff --git a/app/settings.py b/app/settings.py
index 15becaf..b4ac8f7 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -111,4 +111,5 @@ SENTRY_USER_ATTRS = ["username"]
SENTRY_CONFIG = {"release": CSENTRY_RELEASE}
# Static local files
-CSENTRY_STATIC_FILES = Path(__file__).parent / "static" / "files"
+CSENTRY_STATIC_DIR = Path(__file__).parent / "static"
+CSENTRY_STATIC_FILES = CSENTRY_STATIC_DIR / "files"
--
GitLab