summaryrefslogtreecommitdiff
path: root/taler-merchant-manual.rst
diff options
context:
space:
mode:
Diffstat (limited to 'taler-merchant-manual.rst')
-rw-r--r--taler-merchant-manual.rst58
1 files changed, 37 insertions, 21 deletions
diff --git a/taler-merchant-manual.rst b/taler-merchant-manual.rst
index d5b9fcc7..f568ef15 100644
--- a/taler-merchant-manual.rst
+++ b/taler-merchant-manual.rst
@@ -66,7 +66,7 @@ special currency “KUDOS” and includes its own special bank.
.. index:: back-office
.. index:: backend
.. index:: DBMS
-.. index:: Postgres
+.. index:: PostgreSQL
The Taler software stack for a merchant consists of four main
components:
@@ -90,8 +90,8 @@ components:
describes how to install and configure this backend.
- A *DBMS* which stores the transaction history for the Taler backend.
For now, the GNU Taler reference implementation only supports
- Postgres, but the code could be easily extended to support another
- DBMS. Please review the Postgres documentation for details on
+ PostgreSQL, but the code could be easily extended to support another
+ DBMS. Please review the PostgreSQL documentation for details on
how to configure the database.
The following image illustrates the various interactions of these key
@@ -348,6 +348,8 @@ Installing the GNU Taler merchant backend
.. include:: frags/installing-taler-merchant.rst
+.. include:: frags/install-before-check.rst
+
Installing the GNU Taler binary packages on Debian
--------------------------------------------------
@@ -357,6 +359,12 @@ Installing the GNU Taler binary packages on Debian
.. include:: frags/apt-install-taler-merchant.rst
+Installing the GNU Taler binary packages on Trisquel
+----------------------------------------------------
+
+.. include:: frags/installing-trisquel.rst
+
+
Installing the GNU Taler binary packages on Ubuntu
--------------------------------------------------
@@ -373,13 +381,21 @@ Installing Taler on Debian GNU/Linux from source
.. index:: Wheezy
.. index:: Jessie
.. index:: Stretch
+.. index:: Buster
+.. index:: Bullseye
.. index:: Debian
Debian Wheezy is too old and lacks most of the packages required.
-Debian Jessie is better, but still lacks PostgreSQL 9.6.
+Debian Jessie, Stretch, and Buster are better, but still lack PostgreSQL 12.
-On Debian Stretch, only GNU libmicrohttpd needs to be compiled from
-source. To install dependencies on Debian stretch, run the following
+.. note::
+
+ When compiling PostgreSQL 12, make sure to
+ do ``make world`` to build the ``contrib/`` modules, and
+ ``cd contrib && make install`` to install them, as well.
+
+On Debian Stretch and Buster, only GNU libmicrohttpd needs to be compiled from
+source. To install dependencies on Debian Stretch, run the following
commands:
.. code-block:: console
@@ -396,8 +412,8 @@ commands:
libjansson-dev \
libpq-dev \
postgresql-9.6
- # wget https://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-latest.tar.gz
- # wget https://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-latest.tar.gz.sig
+ # wget https://ftpmirror.gnu.org/libmicrohttpd/libmicrohttpd-latest.tar.gz
+ # wget https://ftpmirror.gnu.org/libmicrohttpd/libmicrohttpd-latest.tar.gz.sig
# gpg -v libmicrohttpd-latest.tar.gz # Should show signed by 939E6BE1E29FC3CC
# tar xf libmicrohttpd-latest.tar.gz
# cd libmicrohttpd-0*
@@ -459,7 +475,7 @@ Backend options
---------------
.. index:: DBMS
-.. index:: Postgres
+.. index:: PostgreSQL
.. index:: UNIX domain socket
.. index:: TCP
.. index:: port
@@ -580,7 +596,7 @@ For the ``postgres`` backend, you need to provide:
This option specifies a postgres access path using the format
``postgres:///$DBNAME``, where ``$DBNAME`` is the name of the
-Postgres database you want to use. Suppose ``$USER`` is the name of
+PostgreSQL database you want to use. Suppose ``$USER`` is the name of
the user who will run the backend process. Then, you need to first
run:
@@ -588,7 +604,7 @@ run:
$ sudo -u postgres createuser -d $USER
-as the Postgres database administrator (usually ``postgres``) to
+as the PostgreSQL database administrator (usually ``postgres``) to
grant ``$USER`` the ability to create new databases. Next, you should
as ``$USER`` run:
@@ -617,7 +633,7 @@ You can improve your security posture if you now REVOKE the rights to CREATE,
DROP or ALTER tables from ``$USER``. However, if you do so, please be aware
that you may have to temporarily GRANT those rights again when you update the
merchant backend. For details on how to REVOKE or GRANT these rights, consult
-the Postgres documentation.
+the PostgreSQL documentation.
Commands, like ``taler-merchant-dbinit``, that support the ``-l LOGFILE``
command-line option, send logging output to standard error by default.
@@ -766,7 +782,7 @@ The following is an example for a complete backend configuration:
CURRENCY = KUDOS
Given the above configuration, the backend will use a database named
-``donations`` within Postgres.
+``donations`` within PostgreSQL.
The backend will deposit the coins it receives to the exchange at
https://exchange.demo.taler.net/, which has the master key
@@ -814,7 +830,7 @@ If everything worked as expected, the command
.. code-block:: console
- $ curl http://localhost:8888/config
+ $ wget -O - http://localhost:8888/config
should return some basic configuration status data about the service.
@@ -837,7 +853,7 @@ Instance setup
First of all, we recommend the use of the single-page administration
application that is served by default at the base URL of the merchant backend.
You can use it to perform all steps described in this section (and more!),
-using a simple Web interface instead of the ``curl`` commands given below.
+using a simple Web interface instead of the ``wget`` commands given below.
The first step for using the backend involves the creation of a ``default``
instance. The ``default`` instance can also create / delete / configure other
@@ -1055,13 +1071,13 @@ follows:
if ($http_authorization !~ "(?i)ApiKey SECURITYTOKEN") {
return 401;
}
- proxy_pass ...; // as above
+ proxy_pass ...; # as above
}
location /management/ {
if ($http_authorization !~ "(?i)ApiKey SECURITYTOKEN") {
return 401;
}
- proxy_pass ...; // as above
+ proxy_pass ...; # as above
}
Here, ``SECURITYTOKEN`` should be replaced with the actual shared secret. Note
@@ -1265,8 +1281,8 @@ merchant. Attempting to upgrade from or to a version in Git is not supported
and may result in subtle data loss.
To safely upgrade the merchant, you should first stop the existing
-``taler-merchant-httpd`` process, backup your merchant database (see Postgres
-manual), and then install the latest version of the code.
+``taler-merchant-httpd`` process, backup your merchant database (see
+PostgreSQL manual), and then install the latest version of the code.
If you REVOKED database permissions, ensure that the rights to CREATE,
DROP, and ALTER tables are GRANTed to ``$USER`` again. Then, run:
@@ -1594,7 +1610,7 @@ A relatively minimal configuration could look like this:
Note that the public key must match the exchange's
-private key and that the Postgres database must
+private key and that the PostgreSQL database must
exist before launching the benchmark. You also
will need to ensure that the Exchange's
details are set up.
@@ -1715,5 +1731,5 @@ request to the merchant, for example:
.. code-block:: console
- $ curl http://$(docker-machine ip)/
+ $ wget -O - http://$(docker-machine ip)/
# A greeting message should be returned by the merchant.