From c64577cfce6c38e724985eda2894ee50386f54f4 Mon Sep 17 00:00:00 2001 From: nocci Date: Fri, 12 Dec 2025 12:24:09 +0000 Subject: [PATCH] Use gnunet-.tar.gz from ftp.gnu.org by default --- README-DE.md | 2 +- README.md | 2 +- scripts/fetch-tarballs.sh | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README-DE.md b/README-DE.md index 3ddd99f..09934f3 100644 --- a/README-DE.md +++ b/README-DE.md @@ -48,7 +48,7 @@ Container-Stack für GNU Taler (Exchange, Merchant, LibEuFin Bank) mit optionale - Nach Passwortänderungen in `.env` ist kein manuelles SQL-Rendering nötig; das Init-Skript liest sie beim Start. - Release-Refs/Tarballs: Tags/Commits unter `https://git.taler.net/{gnunet,exchange,merchant,libeufin}.git/` ansehen (Tarballs via `.../snapshot/.tar.gz`) und `*_REF`/`GNUNET_TARBALL_URL` entsprechend setzen. - Offline-Tarballs: Lege Tarballs unter `vendor/` ab (`gnunet-*.tar.gz`, `exchange-*.tar.gz`, `merchant-*.tar.gz`, `libeufin-*.tar.gz`); bei unvollständigem Tarball fällt der Build auf Git zurück. -- Release-Tarballs laden: `./scripts/fetch-tarballs.sh` (GNUnet von `https://ftp.gnu.org/gnu/gnunet/`, Taler-Komponenten von `https://ftp.fau.de/gnu/taler/`; liest `.env`, deshalb greifen `*_VERSION` oder `*_TARBALL_URL`). +- Release-Tarballs laden: `./scripts/fetch-tarballs.sh` (GNUnet von `https://ftp.gnu.org/gnu/gnunet/gnunet-.tar.gz`, Taler-Komponenten von `https://ftp.fau.de/gnu/taler/`; liest `.env`, deshalb greifen `*_VERSION` oder `*_TARBALL_URL`). ## Nützliche Kommandos - Logs: `docker compose logs -f exchange` (oder bank/merchant/caddy/wordpress). diff --git a/README.md b/README.md index 5c37bd0..5fd9a70 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ Container stack for GNU Taler (Exchange, Merchant, LibEuFin Bank) with optional - After changing DB passwords in `.env`, no manual SQL rendering is needed—the init script reads them at container start. - Release refs/tarballs: Browse tags/commits at `https://git.taler.net/{gnunet,exchange,merchant,libeufin}.git/` (Tarballs via `.../snapshot/.tar.gz`) and set `*_REF`/`GNUNET_TARBALL_URL` accordingly. - Offline tarball drop-in: place tarballs under `vendor/` (`gnunet-*.tar.gz`, `exchange-*.tar.gz`, `merchant-*.tar.gz`, `libeufin-*.tar.gz`); the build picks the first match and falls back to git if incomplete. -- Fetch release tarballs: `./scripts/fetch-tarballs.sh` (GNUnet from `https://ftp.gnu.org/gnu/gnunet/`, Taler components from `https://ftp.fau.de/gnu/taler/`; reads `.env` so `*_VERSION`/`*_TARBALL_URL` overrides work). +- Fetch release tarballs: `./scripts/fetch-tarballs.sh` (GNUnet from `https://ftp.gnu.org/gnu/gnunet/gnunet-.tar.gz`, Taler components from `https://ftp.fau.de/gnu/taler/`; reads `.env` so `*_VERSION`/`*_TARBALL_URL` overrides work). ## Useful commands - Logs: `docker compose logs -f exchange` (or bank/merchant/caddy/wordpress). diff --git a/scripts/fetch-tarballs.sh b/scripts/fetch-tarballs.sh index 3775637..80939a8 100755 --- a/scripts/fetch-tarballs.sh +++ b/scripts/fetch-tarballs.sh @@ -18,13 +18,13 @@ if [[ -f "${ROOT_DIR}/.env" ]]; then set +a fi -GNUNET_VERSION="${GNUNET_VERSION:-0.26.1}" +GNUNET_VERSION="${GNUNET_VERSION:-0.21.2}" EXCHANGE_VERSION="${EXCHANGE_VERSION:-1.2.2}" MERCHANT_VERSION="${MERCHANT_VERSION:-1.1.6}" LIBEUFIN_VERSION="${LIBEUFIN_VERSION:-1.2.3}" -# GNUnet tarball is hosted under the gnunet mirror, Taler components under the Taler mirror. -GNUNET_URL="${GNUNET_TARBALL_URL:-https://ftp.fau.de/gnunet/gnunet-debian-${GNUNET_VERSION}.tar.gz}" +# GNUnet tarball is hosted under the GNUnet mirror, Taler components under the Taler mirror. +GNUNET_URL="${GNUNET_TARBALL_URL:-https://ftp.gnu.org/gnu/gnunet/gnunet-${GNUNET_VERSION}.tar.gz}" EXCHANGE_URL="${EXCHANGE_TARBALL_URL:-https://ftp.fau.de/gnu/taler/exchange-${EXCHANGE_VERSION}.tar.gz}" MERCHANT_URL="${MERCHANT_TARBALL_URL:-https://ftp.fau.de/gnu/taler/merchant-${MERCHANT_VERSION}.tar.gz}" LIBEUFIN_URL="${LIBEUFIN_TARBALL_URL:-https://ftp.fau.de/gnu/taler/libeufin-${LIBEUFIN_VERSION}.tar.gz}"