config: update READMEs and compose files for various services

This commit is contained in:
Hernâni Marques 2026-09-12 21:37:05 +02:00
parent b19b1d3cf6
commit 2eb44c95d9
No known key found for this signature in database
12 changed files with 145 additions and 27 deletions

View file

@ -13,9 +13,9 @@ paywalls on **90289031** (Caddy unchanged). App backends listen loopback only
| Live | `/home/hernani/koopa-paivana/` |
| Containers | `koopa-paivana`, `koopa-paivana-{silverbullet,galene,cryptpad,meet}`, `koopa-paivana-upstream` |
| Image | `localhost/koopa-paivana:latest` (built from `Containerfile`); process **uid 1000** `paivana-httpd` |
| Upstream | portal: `nginxinc/nginx-unprivileged` on **:8080**; apps via host `172.17.0.1:1912819131` |
| Upstream | portal: `nginxinc/nginx-unprivileged` on **:8080**; apps via pasta host IP `172.17.0.1:1912819131` (compose publish, not `127.0.0.1`) |
| Host ports | **9025** portal; **9028/9029/9030/9031** app paywalls → Caddy |
| Currency | **GOA** (goa-shop); other units need other merchant backends / later instances |
| Currency | **multi** via goa-shop template `paivana` choices (CHF / FLOODS / GOA / TESTPAYSAN); wallet still filters by held coins |
| Merchant | `https://taler.hacktivism.ch/instances/goa-shop/` |
| Template | `paivana` (`template_type: paivana`, amount **`GOA:42`**, `website_regex: .*`) |
| Access | **`-g`** site-wide: pay once → that hostname free to browse |
@ -161,8 +161,7 @@ curl -X POST 'https://taler.hacktivism.ch/instances/goa-shop/private/templates'
}'
```
goa-shop is GOA-only. TESTPAYSAN / FLOODS / talersticker CHF / stage-CHF need
other `MERCHANT_BACKEND_URL` values (separate Paivana process or later phase).
goa-shop template `paivana` exposes multi-currency **choices**. Wallet/UI still only offers currencies the wallet holds. Live conf must use `instances/goa-shop/` + matching merchant token (not `goa-demo-*`).
## Docs

View file

@ -7,8 +7,8 @@
# 9029 → paywall galene
# 9030 → paywall cryptpad
# 9031 → paywall meet (Jitsi web)
# App backends (loopback only; see app compose):
# 127.0.0.1:19128 / 19129 / 19130 / 19131
# App backends on pasta host IP (see app compose; not LAN 0.0.0.0):
# 172.17.0.1:19128 / 19129 / 19130 / 19131
x-paivana-common: &paivana-common
image: localhost/koopa-paivana:latest
@ -26,7 +26,7 @@ x-paivana-common: &paivana-common
- ./secrets/paivana-secret:/run/secrets/paivana-secret:ro
labels:
org.hacktivism.managed_by: koopa-admin
org.hacktivism.currency: GOA
org.hacktivism.currency: multi
services:
paivana:
@ -47,7 +47,7 @@ services:
org.hacktivism.host_port: "9025"
org.hacktivism.site: paivana.hacktivism.ch
org.hacktivism.managed_by: koopa-admin
org.hacktivism.currency: GOA
org.hacktivism.currency: multi
# App paywalls: same image/secrets; BASE/DEST via env. Caddy still hits 90289031.
paivana-silverbullet:
@ -63,7 +63,7 @@ services:
org.hacktivism.host_port: "9028"
org.hacktivism.site: silverbullet.hacktivism.ch
org.hacktivism.managed_by: koopa-admin
org.hacktivism.currency: GOA
org.hacktivism.currency: multi
paivana-galene:
<<: *paivana-common
@ -78,7 +78,7 @@ services:
org.hacktivism.host_port: "9029"
org.hacktivism.site: galene.hacktivism.ch
org.hacktivism.managed_by: koopa-admin
org.hacktivism.currency: GOA
org.hacktivism.currency: multi
paivana-cryptpad:
<<: *paivana-common
@ -93,7 +93,7 @@ services:
org.hacktivism.host_port: "9030"
org.hacktivism.site: cryptpad.hacktivism.ch
org.hacktivism.managed_by: koopa-admin
org.hacktivism.currency: GOA
org.hacktivism.currency: multi
paivana-meet:
<<: *paivana-common
@ -108,7 +108,7 @@ services:
org.hacktivism.host_port: "9031"
org.hacktivism.site: meet.hacktivism.ch
org.hacktivism.managed_by: koopa-admin
org.hacktivism.currency: GOA
org.hacktivism.currency: multi
upstream:
image: docker.io/nginxinc/nginx-unprivileged:1.27-alpine

View file

@ -45,7 +45,7 @@
<h1>hacktivism tools</h1>
<p>
You paid once via GNU Taler / Paivana
(<strong class="price">GOA:42</strong> on this merchant).
(template <code>paivana</code> on <code>goa-shop</code>: CHF / FLOODS / GOA / TESTPAYSAN choices).
Site-wide access cookie is set for <code>paivana.hacktivism.ch</code>.
</p>
<div class="card sites">
@ -58,7 +58,7 @@
<p><strong>Notes</strong></p>
<ul>
<li>One Paivana process = one <code>DESTINATION_BASE_URL</code> → this portal is the gated upstream.</li>
<li>Merchant: <code>goa-shop</code> · template <code>paivana</code>.</li>
<li>Merchant: <code>goa-shop</code> · template <code>paivana</code> (multi-currency choices).</li>
<li>Host: <code>https://paivana.hacktivism.ch/</code></li>
</ul>
</div>