diff --git a/snapy/settings.py b/snapy/settings.py index 31704bba..342170f7 100644 --- a/snapy/settings.py +++ b/snapy/settings.py @@ -177,12 +177,15 @@ # STATIC_ROOT = BASE_DIR / "staticfiles" USE_S3 = env.bool("USE_S3", False) if USE_S3: + AWS_QUERYSTRING_AUTH = False AWS_ACCESS_KEY_ID = os.getenv("AWS_ACCESS_KEY_ID") AWS_SECRET_ACCESS_KEY = os.getenv("AWS_SECRET_ACCESS_KEY") AWS_STORAGE_BUCKET_NAME = os.getenv("AWS_STORAGE_BUCKET_NAME") AWS_DEFAULT_ACL = "public-read" AWS_S3_ENDPOINT_URL = "https://ams3.digitaloceanspaces.com" AWS_S3_OBJECT_PARAMETERS = {"CacheControl": "max-age=86400"} + AWS_PRELOAD_METADATA = True + AWS_IS_GZIPPED = True # static settings AWS_LOCATION = "static" diff --git a/snapy/urls.py b/snapy/urls.py index f9045dae..b894a06a 100644 --- a/snapy/urls.py +++ b/snapy/urls.py @@ -18,11 +18,11 @@ """ from django.contrib import admin -from django.urls import include, path, re_path +from django.urls import include, re_path urlpatterns = [ - path("jet/", include("jet.urls", "jet")), # Django JET URLS - path("jet/dashboard/", include("jet.dashboard.urls", "jet-dashboard")), # Django JET dashboard URLS - re_path(r"^v4/", include(("api.urls", "api"), namespace="v4")), + re_path(r"^v4/jet/", include("jet.urls", "jet")), # Django JET URLS + re_path(r"^v4/jet/dashboard/", include("jet.dashboard.urls", "jet-dashboard")), # Django JET dashboard URLS re_path(r"^v4/admin/", admin.site.urls), + re_path(r"^v4/", include(("api.urls", "api"), namespace="v4")), ]