Loading jama/settings.py +16 −23 Original line number Diff line number Diff line """ Django settings for jama project. Generated by 'django-admin startproject' using Django 3.1.1. For more information on this file, see https://docs.djangoproject.com/en/3.1/topics/settings/ For the full list of settings and their values, see https://docs.djangoproject.com/en/3.1/ref/settings/ """ from pathlib import Path import os 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 os.makedirs(Path(BASE_DIR, "var"), exist_ok=True) JAMA_URL_BASE_PATH = os.getenv("JAMA_URL_BASE_PATH") or "" 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 Loading @@ -28,27 +17,33 @@ JAMA_SQLITE_DB_PATH = os.getenv("JAMA_SQLITE_DB_PATH", "") JAMA_IIIF_PROCESSING_DIR = os.getenv( "JAMA_IIIF_PROCESSING_DIR", f"{BASE_DIR}/processing" ) PARTIAL_UPLOADS_DIR = os.getenv("JAMA_PARTIAL_UPLOADS_DIR") or "{}/{}".format( BASE_DIR, "partial_uploads" PARTIAL_UPLOADS_DIR = os.getenv("JAMA_PARTIAL_UPLOADS_DIR") or str( Path(BASE_DIR, "var", "partial_uploads").resolve() ) os.makedirs(PARTIAL_UPLOADS_DIR, exist_ok=True) MEDIA_FILES_DIR = os.getenv("JAMA_FILES_DIR") or "{}/{}".format( BASE_DIR, "media_source_files" MEDIA_FILES_DIR = os.getenv("JAMA_FILES_DIR") or str( Path(BASE_DIR, "var", "media_source_files").resolve() ) os.makedirs(MEDIA_FILES_DIR, exist_ok=True) TMP_THUMBNAILS_DIR = os.getenv("JAMA_TMP_THUMBNAILS_DIR") or tempfile.gettempdir() JAMA_SITE = os.getenv("JAMA_SITE") or "http://localhost:8000/" JAMA_IIIF_UPSCALING_PREFIX = os.getenv("JAMA_IIIF_UPSCALING_PREFIX") or "" IIIF_DIR = os.getenv("JAMA_IIIF_DIR") or "{}/{}".format(BASE_DIR, "iiif") IIIF_DIR = os.getenv("JAMA_IIIF_DIR") or str(Path(BASE_DIR, "var", "iiif").resolve()) os.makedirs(IIIF_DIR, exist_ok=True) IIIF_PATH_SEPARATOR = os.getenv("JAMA_IIIF_PATH_SEPARATOR") or os.path.sep ARK_SERVER = os.getenv("JAMA_ARK_SERVER", "") ARK_APP_ID = os.getenv("JAMA_ARK_APP_ID", "") ARK_SECRET_KEY = os.getenv("JAMA_ARK_SECRET_KEY", "") CACHE_FILE_LOCATION = os.getenv("CACHE_LOCATION", f"{BASE_DIR}/cache") CACHE_FILE_LOCATION = os.getenv( "CACHE_LOCATION", str(Path(BASE_DIR, "var", "cache").resolve()) ) os.makedirs(CACHE_FILE_LOCATION, exist_ok=True) # SECURITY WARNING: keep the secret key used in production secret! SECRET_KEY = ( Loading Loading @@ -161,9 +156,6 @@ TEMPLATES = [ WSGI_APPLICATION = "jama.wsgi.application" # Database # https://docs.djangoproject.com/en/3.1/ref/settings/#databases if JAMA_SQLITE_DB_PATH: DATABASES = { Loading Loading @@ -260,9 +252,10 @@ LOGGING = { }, } HUEY = { "huey_class": "huey.SqliteHuey", # Huey implementation to use. "filename": "{}/huey.db".format(BASE_DIR), "filename": Path(BASE_DIR, "var", "huey.db").resolve(), "results": True, # Store return values of tasks. "store_none": False, # If a task returns None, do not save to results. "immediate": False, # If DEBUG=True, run synchronously. Loading Loading
jama/settings.py +16 −23 Original line number Diff line number Diff line """ Django settings for jama project. Generated by 'django-admin startproject' using Django 3.1.1. For more information on this file, see https://docs.djangoproject.com/en/3.1/topics/settings/ For the full list of settings and their values, see https://docs.djangoproject.com/en/3.1/ref/settings/ """ from pathlib import Path import os 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 os.makedirs(Path(BASE_DIR, "var"), exist_ok=True) JAMA_URL_BASE_PATH = os.getenv("JAMA_URL_BASE_PATH") or "" 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 Loading @@ -28,27 +17,33 @@ JAMA_SQLITE_DB_PATH = os.getenv("JAMA_SQLITE_DB_PATH", "") JAMA_IIIF_PROCESSING_DIR = os.getenv( "JAMA_IIIF_PROCESSING_DIR", f"{BASE_DIR}/processing" ) PARTIAL_UPLOADS_DIR = os.getenv("JAMA_PARTIAL_UPLOADS_DIR") or "{}/{}".format( BASE_DIR, "partial_uploads" PARTIAL_UPLOADS_DIR = os.getenv("JAMA_PARTIAL_UPLOADS_DIR") or str( Path(BASE_DIR, "var", "partial_uploads").resolve() ) os.makedirs(PARTIAL_UPLOADS_DIR, exist_ok=True) MEDIA_FILES_DIR = os.getenv("JAMA_FILES_DIR") or "{}/{}".format( BASE_DIR, "media_source_files" MEDIA_FILES_DIR = os.getenv("JAMA_FILES_DIR") or str( Path(BASE_DIR, "var", "media_source_files").resolve() ) os.makedirs(MEDIA_FILES_DIR, exist_ok=True) TMP_THUMBNAILS_DIR = os.getenv("JAMA_TMP_THUMBNAILS_DIR") or tempfile.gettempdir() JAMA_SITE = os.getenv("JAMA_SITE") or "http://localhost:8000/" JAMA_IIIF_UPSCALING_PREFIX = os.getenv("JAMA_IIIF_UPSCALING_PREFIX") or "" IIIF_DIR = os.getenv("JAMA_IIIF_DIR") or "{}/{}".format(BASE_DIR, "iiif") IIIF_DIR = os.getenv("JAMA_IIIF_DIR") or str(Path(BASE_DIR, "var", "iiif").resolve()) os.makedirs(IIIF_DIR, exist_ok=True) IIIF_PATH_SEPARATOR = os.getenv("JAMA_IIIF_PATH_SEPARATOR") or os.path.sep ARK_SERVER = os.getenv("JAMA_ARK_SERVER", "") ARK_APP_ID = os.getenv("JAMA_ARK_APP_ID", "") ARK_SECRET_KEY = os.getenv("JAMA_ARK_SECRET_KEY", "") CACHE_FILE_LOCATION = os.getenv("CACHE_LOCATION", f"{BASE_DIR}/cache") CACHE_FILE_LOCATION = os.getenv( "CACHE_LOCATION", str(Path(BASE_DIR, "var", "cache").resolve()) ) os.makedirs(CACHE_FILE_LOCATION, exist_ok=True) # SECURITY WARNING: keep the secret key used in production secret! SECRET_KEY = ( Loading Loading @@ -161,9 +156,6 @@ TEMPLATES = [ WSGI_APPLICATION = "jama.wsgi.application" # Database # https://docs.djangoproject.com/en/3.1/ref/settings/#databases if JAMA_SQLITE_DB_PATH: DATABASES = { Loading Loading @@ -260,9 +252,10 @@ LOGGING = { }, } HUEY = { "huey_class": "huey.SqliteHuey", # Huey implementation to use. "filename": "{}/huey.db".format(BASE_DIR), "filename": Path(BASE_DIR, "var", "huey.db").resolve(), "results": True, # Store return values of tasks. "store_none": False, # If a task returns None, do not save to results. "immediate": False, # If DEBUG=True, run synchronously. Loading