diff --git a/README.md b/README.md index b7981a9..9209e64 100644 --- a/README.md +++ b/README.md @@ -25,8 +25,6 @@ Check and, if you would like, change the following environment variables for the | NEXUS_PORT | Port of Nexus OSS | | NEXUS_PATH | [Context path](https://help.sonatype.com/en/configuring-the-runtime-environment.html#changing-the-context-path) of Nexus OSS. Only used if the Nexus is hosted behind a reverse proxy with a URL like `https://your_url.domain/nexus/`. If not defined, the base URI remains `/`. | | ENTR_FALLBACK | If defined, don't use `entr` to check for allowlist updates (this will be less reactive but we have found `entr` to not work in some situations) | -| PYPI_REMOTE_URL | URL of the PYPI Remote repository (`https://pypi.org/` by default) | -| CRAN_REMOTE_URL | URL of the CRAN Remote repository (`https://cran.r-project.org/` by default) | | APT_REMOTE_URL | URL of the APT Remote repository (`http://deb.debian.org/debian` by default) | | APT_DISTRO | Name of the APT distribution (`bookworm` by default) | | APT_ALLOWED_ARCHIVES | Comma-separated list of the authorized APT archives (`main,contrib,non-free-firmware,non-free` by default) | @@ -140,4 +138,4 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d -This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome! \ No newline at end of file +This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome! diff --git a/nexus_allowlist/actions.py b/nexus_allowlist/actions.py index c89c6a5..6da674a 100644 --- a/nexus_allowlist/actions.py +++ b/nexus_allowlist/actions.py @@ -8,8 +8,6 @@ ALLOWED_ARCHIVES, APT_DISTRO, APT_REMOTE_URL, - CRAN_REMOTE_URL, - PYPI_REMOTE_URL, ) @@ -24,12 +22,12 @@ class Repository: "pypi_proxy": Repository( repo_type=RepositoryType.PYPI, name="pypi-proxy", - remote_url=PYPI_REMOTE_URL, + remote_url="https://pypi.org", ), "cran_proxy": Repository( repo_type=RepositoryType.CRAN, name="cran-proxy", - remote_url=CRAN_REMOTE_URL, + remote_url="https://cran.r-project.org", ), "apt_proxy": Repository( repo_type=RepositoryType.APT, diff --git a/nexus_allowlist/settings.py b/nexus_allowlist/settings.py index 2ee1791..e7d7958 100644 --- a/nexus_allowlist/settings.py +++ b/nexus_allowlist/settings.py @@ -1,7 +1,5 @@ import os -PYPI_REMOTE_URL = os.getenv("PYPI_REMOTE_URL", "https://pypi.org/") -CRAN_REMOTE_URL = os.getenv("CRAN_REMOTE_URL", "https://cran.r-project.org/") APT_REMOTE_URL = os.getenv("APT_REMOTE_URL", "http://deb.debian.org/debian") APT_DISTRO = os.getenv("APT_DISTRO", "bookworm") ALLOWED_ARCHIVES = os.getenv(