Commit a5dfa143 authored by Mickaël Desfrênes's avatar Mickaël Desfrênes
Browse files

safer defaults

parent 1c997595

jama/settings.py

+5 −4
Original line number Diff line number Diff line
@@ -17,11 +17,13 @@ import tempfile 
DEFAULT_AUTO_FIELD = "django.db.models.AutoField"

# Build paths inside the project like this: BASE_DIR / 'subdir'.

BASE_DIR = Path(__file__).resolve().parent.parent



JAMA_URL_BASE_PATH = os.getenv("JAMA_URL_BASE_PATH") or ""

JAMA_USE_MODSHIB = True if os.getenv("JAMA_USE_MODSHIB", "1") == "1" else False

JAMA_USE_CACHALOT = True if os.getenv("JAMA_USE_CACHALOT", "1") == "1" else False

JAMA_USE_MODSHIB = True if os.getenv("JAMA_USE_MODSHIB", "0") == "1" else False

JAMA_USE_CACHALOT = True if os.getenv("JAMA_USE_CACHALOT", "0") == "1" else False

JAMA_USE_WEBP = True if os.getenv("JAMA_USE_WEBP", "1") == "1" else False

JAMA_USE_OAI = True if os.getenv("JAMA_USE_OAI", "1") == "1" else False

JAMA_USE_OAI = True if os.getenv("JAMA_USE_OAI", "0") == "1" else False

JAMA_USE_ARK = True if os.getenv("JAMA_USE_ARK", "0") == "1" else False

JAMA_IIIF_PROCESSING_DIR = os.getenv(

    "JAMA_IIIF_PROCESSING_DIR", f"{BASE_DIR}/processing"

)
@@ -59,7 +61,6 @@ JAMA_IIIF_ENDPOINT = os.getenv("JAMA_IIIF_ENDPOINT") or "http://localhost/iip/II 
JAMA_LOG_FILE = os.getenv("JAMA_LOG_FILE") or "{}/jama.log".format(BASE_DIR)

ALLOWED_HOSTS = ["*"]

CSRF_TRUSTED_ORIGINS = [JAMA_SITE[:-1]]

JAMA_WEBHOOK_TOKEN = os.getenv("JAMA_WEBHOOK_TOKEN") or None



# Application definition

jama/urls.py

+10 −3
Original line number Diff line number Diff line
@@ -14,17 +14,24 @@ urlpatterns = [ 
    path(settings.JAMA_URL_BASE_PATH + "rpc/", include("rpc.urls")),

    path(settings.JAMA_URL_BASE_PATH + "resources/", include("resources.urls")),

    path(settings.JAMA_URL_BASE_PATH + "status", views.status),

]



if settings.JAMA_USE_ARK:

    urlpatterns.append(

        path(

            settings.JAMA_URL_BASE_PATH + "ark/resource/<int:resource_id>/",

            views.ark_resource,

            name="ark_resource",

    ),

        )

    )

    urlpatterns.append(

        path(

            settings.JAMA_URL_BASE_PATH + "ark/collection/<int:collection_id>/",

            views.ark_collection,

            name="ark_collection",

    ),

]

        )

    )





if settings.JAMA_USE_OAI:

    urlpatterns.append(path(settings.JAMA_URL_BASE_PATH + "oai/", include("oai.urls")))