From 5751be8fb4bffefd9f06bc99de9f5bb940c3f8d5 Mon Sep 17 00:00:00 2001 From: Kairo de Araujo Date: Sat, 29 Jul 2023 12:23:59 +0200 Subject: [PATCH] Rename the TUF_API_URL to RSTUF_API_URL Rename the environment variable setting `TUF_API_URL` to `RSTUF_API_URL` as this API is provided by Repository Service for TUF (RSTUF). Signed-off-by: Kairo de Araujo --- dev/environment | 2 +- warehouse/config.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/environment b/dev/environment index 84611617efad..62741122bfac 100644 --- a/dev/environment +++ b/dev/environment @@ -71,7 +71,7 @@ RECAPTCHA_SITE_KEY=6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI RECAPTCHA_SECRET_KEY=6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe TUF_METADATA_URL="http://files:9001/metadata/" -TUF_API_URL="http://rstuf-api/api/v1/" +RSTUF_API_URL="http://rstuf-api/api/v1/" TUF_DATABASE_URL="postgresql://postgres@db/rstuf" TUF_ROOT_SECRET="an insecure private key password" TUF_ONLINE_SECRET="an insecure private key password" diff --git a/warehouse/config.py b/warehouse/config.py index af5b0e748621..14f7698a7599 100644 --- a/warehouse/config.py +++ b/warehouse/config.py @@ -254,7 +254,7 @@ def configure(settings=None): ) maybe_set(settings, "tuf.database.url", "TUF_DATABASE_URL") maybe_set(settings, "tuf.metadata.url", "TUF_METADATA_URL") - maybe_set(settings, "tuf.api.url", "TUF_API_URL") + maybe_set(settings, "tuf.api.url", "RSTUF_API_URL") maybe_set(settings, "tuf.root1.secret", "TUF_ROOT_SECRET") maybe_set(settings, "tuf.root2.secret", "TUF_ROOT_SECRET") maybe_set(settings, "tuf.online.secret", "TUF_ROOT_SECRET")