diff --git a/config/settings/dev.py b/config/settings/dev.py index 09dd84253..023e72516 100644 --- a/config/settings/dev.py +++ b/config/settings/dev.py @@ -40,10 +40,11 @@ # CANDIG SETTINGS # --------------- +CANDIG_OPA_URL = os.getenv("OPA_URL") CACHE_DURATION = int(os.getenv("CACHE_DURATION", 86400)) # default to 1 day CONN_MAX_AGE = int(os.getenv("CONN_MAX_AGE", 0)) -if exists("/run/secrets/opa-root-token"): - with open("/run/secrets/opa-root-token", "r") as f: +if exists("/run/secrets/opa-service-token"): + with open("/run/secrets/opa-service-token", "r") as f: CANDIG_OPA_SECRET = f.read() if exists("/run/secrets/katsu_secret"): with open("/run/secrets/katsu_secret", "r") as f: diff --git a/config/settings/prod.py b/config/settings/prod.py index 2a8a0dcb0..012abc513 100644 --- a/config/settings/prod.py +++ b/config/settings/prod.py @@ -22,10 +22,11 @@ # CANDIG SETTINGS # --------------- +CANDIG_OPA_URL = os.getenv("OPA_URL") CACHE_DURATION = int(os.getenv("CACHE_DURATION", 86400)) # default to 1 day CONN_MAX_AGE = int(os.getenv("CONN_MAX_AGE", 0)) -if exists("/run/secrets/opa-root-token"): - with open("/run/secrets/opa-root-token", "r") as f: +if exists("/run/secrets/opa-service-token"): + with open("/run/secrets/opa-service-token", "r") as f: CANDIG_OPA_SECRET = f.read() if exists("/run/secrets/katsu_secret"): with open("/run/secrets/katsu_secret", "r") as f: diff --git a/requirements/base.txt b/requirements/base.txt index 33160c558..77ed29048 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,4 +1,4 @@ -candigv2-authx@git+https://github.com/CanDIG/candigv2-authx.git@v2.2.2 # CANDIG authorization wrapper +candigv2-authx@git+https://github.com/CanDIG/candigv2-authx.git@daisieh/aud # CANDIG authorization wrapper Django==5.0.4 # Python web framework psycopg[binary]==3.1.18 # PostgreSQL driver for Python django-cors-headers==4.3.1 # handling the server headers required for CORS