diff --git a/2026/2026-07-09--exchange-snapshot-and-restore.md b/2026/2026-07-09--exchange-snapshot-and-restore.md index 9942950..f2ff730 100644 --- a/2026/2026-07-09--exchange-snapshot-and-restore.md +++ b/2026/2026-07-09--exchange-snapshot-and-restore.md @@ -2,7 +2,7 @@ **Scope:** local on host **koopa** only. No registry, no upload, no public internet publish. -Container was **stopped** then **committed/saved**. Live name: `taler-exchange-hacktivism`. +Container was **stopped** then **committed/saved**. Live name: `taler-hacktivism-exchange-ansible`. --- @@ -16,7 +16,7 @@ Directory (hernani on koopa): | File | Role | Size (approx.) | |------|------|----------------| -| `taler-exchange-hacktivism-live-20260709-snapshot.tar` | full exchange image archive | **~1.6 G** | +| `taler-hacktivism-exchange-ansible-live-20260709-snapshot.tar` | full exchange image archive | **~1.6 G** | | `taler-hacktivism-live-20260709-snapshot.tar` | merchant archive (partial earlier run) | ~2.4 G | | `SHA256SUMS` | checksums for completed saves | | @@ -24,8 +24,8 @@ Directory (hernani on koopa): | Image | Tag | Notes | |-------|-----|--------| -| `localhost/taler-exchange-hacktivism-live` | `20260709-snapshot` | committed from stopped container | -| `localhost/taler-exchange-hacktivism-live` | `9011` | previous live tag (still present) | +| `localhost/taler-hacktivism-exchange-ansible-live` | `20260709-snapshot` | committed from stopped container | +| `localhost/taler-hacktivism-exchange-ansible-live` | `9011` | previous live tag (still present) | | `localhost/taler-hacktivism-live` | `20260709-snapshot` | merchant (if commit kept) | | `localhost/taler-bank-hacktivism-live` | `20260709-snapshot` | bank (if commit kept) | @@ -36,13 +36,13 @@ Verify: ls -lh /home/hernani/images/taler-stack-20260709-snapshot/ sha256sum -c /home/hernani/images/taler-stack-20260709-snapshot/SHA256SUMS podman images | grep exchange -podman ps -a --filter name=taler-exchange-hacktivism +podman ps -a --filter name=taler-hacktivism-exchange-ansible ``` Expected container state after stop: ```text -taler-exchange-hacktivism Exited (…) localhost/taler-exchange-hacktivism-live:9011 0.0.0.0:9011->9011/tcp +taler-hacktivism-exchange-ansible Exited (…) localhost/taler-hacktivism-exchange-ansible-live:9011 0.0.0.0:9011->9011/tcp ``` --- @@ -51,19 +51,19 @@ taler-exchange-hacktivism Exited (…) localhost/taler-exchange-hacktivism-liv ```bash # as hernani@koopa — local only -podman stop taler-exchange-hacktivism +podman stop taler-hacktivism-exchange-ansible TAG=20260709-snapshot OUT=/home/hernani/images/taler-stack-$TAG mkdir -p "$OUT" -podman commit taler-exchange-hacktivism \ - localhost/taler-exchange-hacktivism-live:$TAG +podman commit taler-hacktivism-exchange-ansible \ + localhost/taler-hacktivism-exchange-ansible-live:$TAG -podman save -o "$OUT/taler-exchange-hacktivism-live-$TAG.tar" \ - localhost/taler-exchange-hacktivism-live:$TAG +podman save -o "$OUT/taler-hacktivism-exchange-ansible-live-$TAG.tar" \ + localhost/taler-hacktivism-exchange-ansible-live:$TAG -sha256sum "$OUT/taler-exchange-hacktivism-live-$TAG.tar" | tee -a "$OUT/SHA256SUMS" +sha256sum "$OUT/taler-hacktivism-exchange-ansible-live-$TAG.tar" | tee -a "$OUT/SHA256SUMS" ``` `-p` on commit pauses the container if still running; after `stop` it is optional. @@ -75,9 +75,9 @@ sha256sum "$OUT/taler-exchange-hacktivism-live-$TAG.tar" | tee -a "$OUT/SHA256SU ### A. From local image tag (fast) ```bash -podman rm -f taler-exchange-hacktivism # only if replacing dead/exited +podman rm -f taler-hacktivism-exchange-ansible # only if replacing dead/exited -podman run -d --name taler-exchange-hacktivism \ +podman run -d --name taler-hacktivism-exchange-ansible \ --network pasta \ -p 9011:9011 \ --label org.hacktivism.service=taler-exchange \ @@ -85,14 +85,14 @@ podman run -d --name taler-exchange-hacktivism \ --label org.hacktivism.site=exchange.hacktivism.ch \ --label org.hacktivism.currency=GOA \ --label org.hacktivism.managed_by=koopa-admin \ - localhost/taler-exchange-hacktivism-live:20260709-snapshot \ + localhost/taler-hacktivism-exchange-ansible-live:20260709-snapshot \ sleep infinity ``` ### B. From tar (if image store was wiped) ```bash -podman load -i /home/hernani/images/taler-stack-20260709-snapshot/taler-exchange-hacktivism-live-20260709-snapshot.tar +podman load -i /home/hernani/images/taler-stack-20260709-snapshot/taler-hacktivism-exchange-ansible-live-20260709-snapshot.tar # then same podman run as above ``` @@ -101,7 +101,7 @@ podman load -i /home/hernani/images/taler-stack-20260709-snapshot/taler-exchange Inside container as **root**, then app user: ```bash -podman exec -u root -it taler-exchange-hacktivism bash +podman exec -u root -it taler-hacktivism-exchange-ansible bash # 1) base: postgres, runtime dirs, secmods, wire helpers /root/start_base_services_for_taler_exchange.sh --no-shell # 2) httpd @@ -149,8 +149,8 @@ scp configs/taler-exchange/exchange-overrides.conf \ hernani@koopa:/tmp/exchange-overrides.conf scp configs/taler-exchange/conf.d-exchange-coins.conf \ hernani@koopa:/tmp/exchange-coins.conf -ssh hernani@koopa 'podman cp /tmp/exchange-overrides.conf taler-exchange-hacktivism:/etc/taler-exchange/exchange-overrides.conf - podman cp /tmp/exchange-coins.conf taler-exchange-hacktivism:/etc/taler-exchange/conf.d/exchange-coins.conf' +ssh hernani@koopa 'podman cp /tmp/exchange-overrides.conf taler-hacktivism-exchange-ansible:/etc/taler-exchange/exchange-overrides.conf + podman cp /tmp/exchange-coins.conf taler-hacktivism-exchange-ansible:/etc/taler-exchange/conf.d/exchange-coins.conf' ``` Greenfield (empty Debian + packages) only: diff --git a/2026/2026-07-09--merchant-bank-link.md b/2026/2026-07-09--merchant-bank-link.md index 401ca8c..31a417a 100644 --- a/2026/2026-07-09--merchant-bank-link.md +++ b/2026/2026-07-09--merchant-bank-link.md @@ -5,4 +5,4 @@ 3. Created bank user `goa-demo-cp4zqk`, credited **GOA:5000**. 4. Linked payto to merchant: `POST .../private/accounts` → active wire account. -See `configs/taler-merchant/demo-instance-goa-demo-cp4zqk.md`. +See `configs/taler-hacktivism/demo-instance-goa-demo-cp4zqk.md`. diff --git a/2026/2026-07-10.md b/2026/2026-07-10.md index d554047..621dead 100644 --- a/2026/2026-07-10.md +++ b/2026/2026-07-10.md @@ -16,3 +16,4 @@ - Caddyfile applied on host: git. in ACME/redirect list, SSH note :9200; live matches configs/caddy mirror (verified) - Bonfire: republish foss outbox → Local users + public internet feeds; guest `/feed/local` shows posts - Reflect live koopa state in admin-log: `host/overview/LIVE.md`, exchange name **taler-hacktivism-exchange-ansible**, ansible mirror +- configs/: rename mirrors to live container names (`taler-hacktivism`, `taler-hacktivism-bank`; image banking) diff --git a/README.md b/README.md index 68a5323..f8a3cb3 100644 --- a/README.md +++ b/README.md @@ -23,9 +23,10 @@ host/ # openSUSE host-level config + overview overview/services.md # graphical service map systemd/ firewalld/ caddy/ network/ configs/ # mirrored app configs (caddy, taler, forgejo, …) - taler-merchant/ # overrides + nginx (same tree style as exchange) - taler-exchange/ # overrides + coins - taler-exchange-ansible/ # live koopa exchange container (ansible) + taler-hacktivism/ # merchant container taler-hacktivism + taler-hacktivism-bank/ # bank container (image …-banking) + taler-exchange/ # exchange conf (inside ansible container) + taler-exchange-ansible/ # container taler-hacktivism-exchange-ansible forgejo/ # rootless git.hacktivism.ch castopod/ bonfire/ prime/ # compose mirrors (no secret values) tor/ # KoopaRelay ORPort 8080 @@ -57,7 +58,7 @@ Start model (user apps): `hernani` → `cd ~/koopa-* && podman-compose up -d`. Public hosts: `taler.` / `exchange.` / `bank.` / `castopod.` / `bonfire.` / `prime.` / `bt.` / **`git.hacktivism.ch`** (Caddy → 9010–9015 / 9020–**9024**; git-SSH host **9200** direct). -Service **details**: `configs/taler-*`, `configs/forgejo/`, `scripts/*`. +Service **details**: `configs/taler-hacktivism*`, `configs/taler-exchange*`, `configs/forgejo/`, `scripts/*`. Host-wide picture: **`host/overview/services.md`**. Port table: **`configs/ports.md`**. Router: **`../vecigate-admin-log`**. diff --git a/benchmarks/amount-ladder/README.md b/benchmarks/amount-ladder/README.md index 737a196..666006d 100644 --- a/benchmarks/amount-ladder/README.md +++ b/benchmarks/amount-ladder/README.md @@ -87,4 +87,4 @@ Outputs under `../../.tmp/amount-bench-/`: ## Related - Partial earlier run (wrong URI): `2026/2026-07-09--amount-ladder-partial-results.md` -- Instance notes: `configs/taler-merchant/demo-instance-goa-demo-cp4zqk.md` +- Instance notes: `configs/taler-hacktivism/demo-instance-goa-demo-cp4zqk.md` diff --git a/benchmarks/amount-ladder/sample-load-inside.sh b/benchmarks/amount-ladder/sample-load-inside.sh index 2b335fd..0895f7e 100755 --- a/benchmarks/amount-ladder/sample-load-inside.sh +++ b/benchmarks/amount-ladder/sample-load-inside.sh @@ -11,8 +11,8 @@ echo "=== mem ===" free -h 2>/dev/null || true echo "=== top host cpu ===" ps -eo pid,pcpu,pmem,rss,etime,comm --sort=-pcpu 2>/dev/null | head -15 -echo "=== exchange (taler-exchange-hacktivism) ===" -podman exec taler-exchange-hacktivism \ +echo "=== exchange (taler-hacktivism-exchange-ansible) ===" +podman exec taler-hacktivism-exchange-ansible \ ps -eo pid,pcpu,pmem,rss,etime,args 2>/dev/null \ | grep -E 'taler-exchange|postgres -D|PID' | head -25 || true echo "=== merchant (taler-hacktivism) ===" diff --git a/configs/README.md b/configs/README.md index 39db0b6..0dc77f7 100644 --- a/configs/README.md +++ b/configs/README.md @@ -1,20 +1,17 @@ -# Configs +# Config mirrors (from host koopa) -| Path | Source on koopa | -|------|-----------------| -| `caddy/` | host `/etc/caddy` | -| `tor/` | host `/etc/tor` | -| `taler-exchange/` | container `taler-exchange-hacktivism`: overrides + coins | -| `taler-merchant/` | container `taler-hacktivism`: overrides + conf.d + nginx vhost | -| `taler-bank/` | container `taler-bank-hacktivism`: bank-overrides (libeufin) | -| `systemd/` | host proxy sockets / caddy drop-in | -| `firewalld/`, `ports.md` | host edge ports | +Directories are named to match **live podman container names** where possible. -Package defaults are not mirrored; **site overrides** and relevant drop-ins only. +| Directory | Live container | Image (typical) | +|-----------|----------------|-----------------| +| `taler-hacktivism/` | `taler-hacktivism` | `taler-hacktivism-live:landing` | +| `taler-hacktivism-bank/` | `taler-hacktivism-bank` | **`taler-hacktivism-banking:live`** | +| `taler-exchange/` | conf inside exchange container | (see exchange-ansible) | +| `taler-exchange-ansible/` | **`taler-hacktivism-exchange-ansible`** | `taler-hacktivism-exchange-ansible:landing` | +| `bank-landing/` `exchange-landing/` `merchant-landing/` | nginx landing snippets | ports 9013–9015 | +| `koopa-*` apps | `koopa-castopod`, `koopa-bonfire`, … | compose mirrors | +| `caddy/` `tor/` `firewalld/` `systemd/` | host services | | -``` -configs/taler-{exchange,merchant,bank}/ - README.md - *-overrides.conf - … -``` +**Authoritative running inventory:** `host/overview/LIVE.md`. + +Secrets never live here — `SECRETS.md` / `koopa-admin-secrets`. diff --git a/configs/taler-exchange/README.md b/configs/taler-exchange/README.md index 6a21121..44aa37e 100644 --- a/configs/taler-exchange/README.md +++ b/configs/taler-exchange/README.md @@ -1,6 +1,12 @@ -# Exchange (GOA) site notes +# Exchange config (inside ansible container) -Container: **`taler-exchange-hacktivism`** · image tags `localhost/taler-exchange-hacktivism-live:9011` (live) and optional snapshot +**Live container:** `taler-hacktivism-exchange-ansible` +**Image:** `localhost/taler-hacktivism-exchange-ansible:landing` +**Deploy tree on host:** `~/ansible-taler-exchange/` → see **`configs/taler-exchange-ansible/`** + +This directory mirrors **exchange software config** (overrides, coins, terms), not the Ansible wrapper itself. + +Container: **`taler-hacktivism-exchange-ansible`** · image tags `localhost/taler-hacktivism-exchange-ansible-live:9011` (live) and optional snapshot Host port: **9011** (pasta) · public: **https://exchange.hacktivism.ch/** (Caddy → 9011) **Snapshot + restore (local tar, no registry):** diff --git a/configs/taler-bank/README.md b/configs/taler-hacktivism-bank/README.md similarity index 85% rename from configs/taler-bank/README.md rename to configs/taler-hacktivism-bank/README.md index c7d975b..1f51875 100644 --- a/configs/taler-bank/README.md +++ b/configs/taler-hacktivism-bank/README.md @@ -1,4 +1,18 @@ -# taler-bank (container `taler-bank-hacktivism`) +# Bank — live container `taler-hacktivism-bank` + +**Reflected from host koopa.** + +| Item | Live | +|------|------| +| Container | **`taler-hacktivism-bank`** | +| Image | **`localhost/taler-hacktivism-banking:live`** | +| Ports | **9012** (API), **9013** (landing) | +| Site | `https://bank.hacktivism.ch` | + +Config path in this repo: **`configs/taler-hacktivism-bank/`** (was `configs/taler-bank/`). +Scripts: `scripts/taler-bank/`. Secrets: `koopa-admin-secrets/.../taler-bank/` → `/root/bank-*-password.txt`. + +--- Image: `docker.io/library/debian:trixie` + package `libeufin-bank` Publish: **9012/tcp only** @@ -81,4 +95,4 @@ nohup /root/auto-confirm-withdrawals.sh --loop 4 >>/var/log/auto-confirm-withdra ``` Script: `scripts/taler-bank/auto-confirm-withdrawals.sh` -Watches IDs in `/var/www/bank-landing/withdraw.uri` and `withdraw-watch.ids`. +Watches IDs in `/var/www/bank-landing/withdraw.uri` and `withdraw-watch.ids`. \ No newline at end of file diff --git a/configs/taler-bank/bank-overrides.conf b/configs/taler-hacktivism-bank/bank-overrides.conf similarity index 100% rename from configs/taler-bank/bank-overrides.conf rename to configs/taler-hacktivism-bank/bank-overrides.conf diff --git a/configs/taler-bank/libeufin-bank.conf.includes.txt b/configs/taler-hacktivism-bank/libeufin-bank.conf.includes.txt similarity index 100% rename from configs/taler-bank/libeufin-bank.conf.includes.txt rename to configs/taler-hacktivism-bank/libeufin-bank.conf.includes.txt diff --git a/configs/taler-merchant/README.md b/configs/taler-hacktivism/README.md similarity index 98% rename from configs/taler-merchant/README.md rename to configs/taler-hacktivism/README.md index a5d7caa..127cd32 100644 --- a/configs/taler-merchant/README.md +++ b/configs/taler-hacktivism/README.md @@ -1,6 +1,6 @@ # taler-merchant (container `taler-hacktivism`) -Image: `localhost/taler-hacktivism-live:9010` +Image: `localhost/taler-hacktivism-live:landing` Publish: **9010/tcp only** Labels: `org.hacktivism.service=taler-merchant`, `host_port=9010`, `site=taler.hacktivism.ch` diff --git a/configs/taler-merchant/conf.d-merchant.conf b/configs/taler-hacktivism/conf.d-merchant.conf similarity index 100% rename from configs/taler-merchant/conf.d-merchant.conf rename to configs/taler-hacktivism/conf.d-merchant.conf diff --git a/configs/taler-merchant/demo-instance-goa-demo-cp4zqk.md b/configs/taler-hacktivism/demo-instance-goa-demo-cp4zqk.md similarity index 100% rename from configs/taler-merchant/demo-instance-goa-demo-cp4zqk.md rename to configs/taler-hacktivism/demo-instance-goa-demo-cp4zqk.md diff --git a/configs/taler-merchant/merchant-overrides.conf b/configs/taler-hacktivism/merchant-overrides.conf similarity index 100% rename from configs/taler-merchant/merchant-overrides.conf rename to configs/taler-hacktivism/merchant-overrides.conf diff --git a/configs/taler-merchant/nginx-taler-merchant.conf b/configs/taler-hacktivism/nginx-taler-merchant.conf similarity index 100% rename from configs/taler-merchant/nginx-taler-merchant.conf rename to configs/taler-hacktivism/nginx-taler-merchant.conf diff --git a/configs/taler-merchant/taler-merchant.conf.includes.txt b/configs/taler-hacktivism/taler-merchant.conf.includes.txt similarity index 100% rename from configs/taler-merchant/taler-merchant.conf.includes.txt rename to configs/taler-hacktivism/taler-merchant.conf.includes.txt diff --git a/configs/taler-merchant/terms-src/merchant-tos-dual-v0.en.rst b/configs/taler-hacktivism/terms-src/merchant-tos-dual-v0.en.rst similarity index 100% rename from configs/taler-merchant/terms-src/merchant-tos-dual-v0.en.rst rename to configs/taler-hacktivism/terms-src/merchant-tos-dual-v0.en.rst diff --git a/host/overview/LIVE.md b/host/overview/LIVE.md index 481a953..c2e2cd0 100644 --- a/host/overview/LIVE.md +++ b/host/overview/LIVE.md @@ -26,7 +26,7 @@ ss -lntp | grep -E '90[0-9]{2}|9200|8080' |------|--------|--------------|-------------| | `taler-hacktivism` | `localhost/taler-hacktivism-live:landing` | **9010**, **9015** | `taler.hacktivism.ch` | | **`taler-hacktivism-exchange-ansible`** | `localhost/taler-hacktivism-exchange-ansible:landing` | **9011**, **9014** | `exchange.hacktivism.ch` | -| `taler-hacktivism-bank` | `localhost/taler-hacktivism-banking:live` | **9012**, **9013** | `bank.hacktivism.ch` | +| `taler-hacktivism-bank` | **`localhost/taler-hacktivism-banking:live`** | **9012**, **9013** | `bank.hacktivism.ch` | | `koopa-castopod` (+ mariadb, redis) | `castopod/castopod:1` | **9020** | `castopod.hacktivism.ch` | | `koopa-bonfire` (+ postgres) | `bonfire:1.0.5-social-amd64` | **9021** | `bonfire.hacktivism.ch` | | `koopa-prime-jellyfin` | `linuxserver/jellyfin:10.10.7` | **9022** | `prime.hacktivism.ch` | @@ -35,7 +35,7 @@ ss -lntp | grep -E '90[0-9]{2}|9200|8080' ### Naming note (exchange) -Live exchange container is **`taler-hacktivism-exchange-ansible`** (not `taler-exchange-hacktivism` / not without `-ansible`). +Live exchange container is **`taler-hacktivism-exchange-ansible`** (not `taler-hacktivism-exchange-ansible` / not without `-ansible`). Managed from **`/home/hernani/ansible-taler-exchange/`** (see `configs/taler-exchange-ansible/`). ## Caddy vhosts → backends @@ -72,6 +72,14 @@ Config: `/etc/caddy/Caddyfile` (mirror `configs/caddy/Caddyfile`). Apply: `~/koo | Exchange (GOA) | `~/ansible-taler-exchange/run-container-koopa.sh` then `deploy-hacktivism-goa.sh` | | User apps | `cd ~/koopa-* && podman-compose up -d` | +## Config mirrors in this repo (`configs/`) + +| Live container | Git path | +|----------------|----------| +| `taler-hacktivism` | `configs/taler-hacktivism/` | +| `taler-hacktivism-bank` (image **…-banking**) | `configs/taler-hacktivism-bank/` | +| `taler-hacktivism-exchange-ansible` | `configs/taler-exchange-ansible/` + conf in `configs/taler-exchange/` | + ## Related docs in this repo | Topic | Doc | diff --git a/host/overview/services.md b/host/overview/services.md index 03e4c69..5d497a3 100644 --- a/host/overview/services.md +++ b/host/overview/services.md @@ -90,7 +90,7 @@ Full port notes: `configs/ports.md`. | Caddy | `host/caddy/`, `configs/caddy/` | | firewalld | `host/firewalld/` | | systemd proxies | `host/systemd/` | -| Merchant container | `configs/taler-merchant/`, `scripts/taler-merchant/` | +| Merchant container | `configs/taler-hacktivism/`, `scripts/taler-merchant/` | | Exchange container | `configs/taler-exchange/`, `scripts/taler-exchange/` | | **Forgejo rootless** | `configs/forgejo/`, `2026/2026-07-10--forgejo-rootless.md` | | Tor relay (`tor.service`) | `configs/tor/`, `host/tor/` | diff --git a/scripts/README.md b/scripts/README.md index 9ca86eb..f7685fd 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -3,8 +3,8 @@ | Dir | Source on koopa | |-----|-----------------| | `taler-merchant/` | podman `taler-hacktivism`: `/root`, `/usr/local/bin` | -| `taler-exchange/` | podman `taler-exchange-hacktivism`: `/root`, `/usr/local/bin` | -| `taler-bank/` | podman `taler-bank-hacktivism`: `/root`, `/usr/local/bin` | +| `taler-exchange/` | podman `taler-hacktivism-exchange-ansible`: `/root`, `/usr/local/bin` | +| `taler-hacktivism-bank/` | podman `taler-hacktivism-bank`: `/root`, `/usr/local/bin` | | `taler-sanity/` | host root checks (stack, settlement, helpers) | | `taler-monitoring/` | **outside-in** public URL walk (`/config` → keys/terms/integration/webui) | | `ops/` | host hygiene (`cleanup-root-scratch.sh`) | @@ -39,11 +39,11 @@ pg_ctlcluster 17 main start | Container | Root base | App start | App user | |-----------|-----------|-----------|----------| | `taler-hacktivism` | `start_base_services_for_taler.sh` | `start_merchant.sh` | `taler-merchant-httpd` | -| `taler-exchange-hacktivism` | `start_base_services_for_taler_exchange.sh` | `start_exchange.sh` | `taler-exchange-httpd` | +| `taler-hacktivism-exchange-ansible` | `start_base_services_for_taler_exchange.sh` | `start_exchange.sh` | `taler-exchange-httpd` | Exchange one-shots (root, offline / wire): `taler-exchange/wire-enable-and-upload.sh`, `offline-sign-upload-keys.sh`, `start_wire_helpers.sh` -| `taler-bank-hacktivism` | `start_base_services_for_taler_bank.sh` | `start_bank.sh` | `libeufin-bank` | +| `taler-hacktivism-bank` | `start_base_services_for_taler_bank.sh` | `start_bank.sh` | `libeufin-bank` | `runuser -u USER -- bash` (never `-u` with `-s` on util-linux). diff --git a/scripts/taler-bank/README.md b/scripts/taler-bank/README.md index 2c66b07..a0afa14 100644 --- a/scripts/taler-bank/README.md +++ b/scripts/taler-bank/README.md @@ -1,6 +1,6 @@ # taler-bank scripts -Container: **`taler-bank-hacktivism`** (libeufin-bank, GOA, **no IBAN**). +Container: **`taler-hacktivism-bank`** (libeufin-bank, GOA, **no IBAN**). | File | Container path | User | |------|----------------|------| @@ -32,4 +32,4 @@ Details + JSON schema: `configs/bank-landing/README.md`. ## Config -See `configs/taler-bank/`. +See `configs/taler-hacktivism-bank/`. diff --git a/scripts/taler-exchange/offline-sign-upload-keys.sh b/scripts/taler-exchange/offline-sign-upload-keys.sh index 7dd4708..0268d9b 100755 --- a/scripts/taler-exchange/offline-sign-upload-keys.sh +++ b/scripts/taler-exchange/offline-sign-upload-keys.sh @@ -1,6 +1,6 @@ #!/bin/bash # Offline: download future keys from local exchange, sign, upload. Restore public BASE_URL. -# Run as root inside taler-exchange-hacktivism. +# Run as root inside taler-hacktivism-exchange-ansible. set -euo pipefail CONF=/etc/taler-exchange/taler-exchange.conf OV=/etc/taler-exchange/exchange-overrides.conf diff --git a/scripts/taler-exchange/wire-enable-and-upload.sh b/scripts/taler-exchange/wire-enable-and-upload.sh index c5da9b2..fd44646 100755 --- a/scripts/taler-exchange/wire-enable-and-upload.sh +++ b/scripts/taler-exchange/wire-enable-and-upload.sh @@ -1,6 +1,6 @@ #!/bin/bash # One-shot: offline enable wire account + fees, upload to local exchange, verify /keys. -# Run as root inside container taler-exchange-hacktivism. +# Run as root inside container taler-hacktivism-exchange-ansible. set -euo pipefail CONF=/etc/taler-exchange/taler-exchange.conf diff --git a/scripts/taler-merchant/install_dual_terms.sh b/scripts/taler-merchant/install_dual_terms.sh index 2855e3f..dbb464d 100644 --- a/scripts/taler-merchant/install_dual_terms.sh +++ b/scripts/taler-merchant/install_dual_terms.sh @@ -3,7 +3,7 @@ # Run as root inside the merchant container (taler-hacktivism). # # Sets files under TERMS_DIR/en/ for TERMS_ETAG = merchant-tos-dual-v0 -# (see configs/taler-merchant/merchant-overrides.conf). +# (see configs/taler-hacktivism/merchant-overrides.conf). set -euo pipefail export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin${PATH:+:$PATH}" diff --git a/scripts/taler-sanity/check_exchange-wirewatch.sh b/scripts/taler-sanity/check_exchange-wirewatch.sh index 89dbb7c..b92da39 100644 --- a/scripts/taler-sanity/check_exchange-wirewatch.sh +++ b/scripts/taler-sanity/check_exchange-wirewatch.sh @@ -53,8 +53,8 @@ else fi # Container credential + wirewatch process -if su - hernani -c 'podman exec taler-exchange-hacktivism true' 2>/dev/null; then - su - hernani -c 'podman exec taler-exchange-hacktivism bash -c " +if su - hernani -c 'podman exec taler-hacktivism-exchange-ansible true' 2>/dev/null; then + su - hernani -c 'podman exec taler-hacktivism-exchange-ansible bash -c " set +e echo \"--- secret (redacted) ---\" if [ -r /etc/taler-exchange/secrets/exchange-accountcredentials-1.secret.conf ]; then @@ -70,9 +70,9 @@ if su - hernani -c 'podman exec taler-exchange-hacktivism true' 2>/dev/null; the ps -eo pid,stat,args | grep \"[w]irewatch\" || echo \"(no wirewatch process)\" "' 2>&1 || warn "podman exec exchange failed" - AUTH_METHOD=$(su - hernani -c 'podman exec -u root taler-exchange-hacktivism \ + AUTH_METHOD=$(su - hernani -c 'podman exec -u root taler-hacktivism-exchange-ansible \ grep -E "^WIRE_GATEWAY_AUTH_METHOD" /etc/taler-exchange/secrets/exchange-accountcredentials-1.secret.conf' 2>/dev/null | awk '{print $3}') - GW_URL=$(su - hernani -c 'podman exec -u root taler-exchange-hacktivism \ + GW_URL=$(su - hernani -c 'podman exec -u root taler-hacktivism-exchange-ansible \ grep -E "^WIRE_GATEWAY_URL" /etc/taler-exchange/secrets/exchange-accountcredentials-1.secret.conf' 2>/dev/null | awk '{print $3}') info "WIRE_GATEWAY_URL=$GW_URL" info "WIRE_GATEWAY_AUTH_METHOD=$AUTH_METHOD" diff --git a/scripts/taler-sanity/check_helpers-running.sh b/scripts/taler-sanity/check_helpers-running.sh index e4042f3..dd28666 100755 --- a/scripts/taler-sanity/check_helpers-running.sh +++ b/scripts/taler-sanity/check_helpers-running.sh @@ -12,7 +12,7 @@ pass() { echo "OK $1"; } warn() { echo "WARN $1"; } bad() { echo "FAIL $1"; fail=$((fail + 1)); } -EXC_CT="${EXCHANGE_CONTAINER:-taler-exchange-hacktivism}" +EXC_CT="${EXCHANGE_CONTAINER:-taler-hacktivism-exchange-ansible}" MER_CT="${MERCHANT_CONTAINER:-taler-hacktivism}" echo "=== ensure + check helpers (no systemd) ==="