Turn settings into a package

redash/settings.py → redash/settings/__init__.py

@@ -22,7 +22,7 @@ def parse_db_url(url):
 
 
 def fix_assets_path(path):
-    fullpath = os.path.join(os.path.dirname(__file__), path)
+    fullpath = os.path.join(os.path.dirname(__file__), "../", path)
     return fullpath
 
 
@@ -156,7 +156,7 @@ def all_settings():
 # Usually it will be a single path, but we allow to specify additional ones to override the default assets. Only the
 # last one will be used for Flask templates.
 STATIC_ASSETS_PATHS = [fix_assets_path(path) for path in os.environ.get("REDASH_STATIC_ASSETS_PATH", "../client/dist/").split(',')]
-STATIC_ASSETS_PATHS.append(fix_assets_path('./static/'))
+STATIC_ASSETS_PATHS.append(fix_assets_path('static/'))
 
 JOB_EXPIRY_TIME = int(os.environ.get("REDASH_JOB_EXPIRY_TIME", 3600 * 12))
 COOKIE_SECRET = os.environ.get("REDASH_COOKIE_SECRET", "c292a0a3aa32397cdb050e233733900f")