commit 03040266462c4080b7a152b0773775de24356059
parent 3d183fabb76492ed1870f0c81308001fe1505ab7
Author: Christian Grothoff <christian@grothoff.org>
Date: Sun, 31 May 2026 12:56:23 +0200
fix Paivana documentation issues
Diffstat:
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/frags/paivana-httpd-manual.rst b/frags/paivana-httpd-manual.rst
@@ -559,7 +559,9 @@ a paywalled URL with ``curl``:
$ curl -i https://example.com/some-article
-An unpaid request should return ``HTTP/1.1 402 Payment Required`` together
+An unpaid request will first redirect (302 Found) to the static
+paywall page at `/.well-known/paivana/templates/{id}#{base64_website}`
+which will then return a ``HTTP/1.1 402 Payment Required`` together
with a Taler-formatted paywall body containing the ``taler://pay/...`` URI of
the freshly created order. Paying that order with any GNU Taler wallet (see
the `Wallet documentation <https://docs.taler.net/wallet/>`__) and
diff --git a/manpages/paivana-httpd.1.rst b/manpages/paivana-httpd.1.rst
@@ -46,11 +46,11 @@ Its options are as follows:
**-h** | **--help**
Print short help on options.
-**-g** | **-global-payment**
+**-g** | **--global-payment**
Disable per-page payment, a single payment is always valid
for the entire site.
-**-n** | **-no-payment**
+**-n** | **--no-payment**
Disable payment, only act as a reverse proxy that does nothing.
Useful to temporarily disable the paywall or to test the
reverse proxy itself.
diff --git a/manpages/paivana.conf.5.rst b/manpages/paivana.conf.5.rst
@@ -60,6 +60,12 @@ DESTINATION_BASE_URL
Base URL of the target HTTP server we forward requests to once
they have passed the paywall check.
+DESTINATION_UNIXPATH
+ Unix domain socket to connect to when forwarding requests.
+ Used when the target REST service (behind the paywall) is
+ running on a UNIX domain socket. DESTINATION_BASE_URL must
+ still be set. This setting is optional.
+
MERCHANT_BACKEND_URL
Base URL of our Taler merchant backend.
@@ -68,7 +74,7 @@ MERCHANT_BACKEND_UNIX_PATH
option if the backend is reachable on the local machine via a
UNIX domain socket.
-MERCHNAT_ACCESS_TOKEN
+MERCHANT_ACCESS_TOKEN
Access token to use when accessing the merchant backend.
This is a secret value.