diff options
Diffstat (limited to 'taler-merchant-manual.rst')
-rw-r--r-- | taler-merchant-manual.rst | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/taler-merchant-manual.rst b/taler-merchant-manual.rst index 7b406649..d5b9fcc7 100644 --- a/taler-merchant-manual.rst +++ b/taler-merchant-manual.rst @@ -510,9 +510,14 @@ To run the Taler backend on TCP port 8888, use: When using the Debian/Ubuntu packages, these options are already configured in the ``/etc/taler/conf.d/merchant.conf`` configuration file. - If you need to change them, you should edit ``/etc/taler/overrides.conf``, - for example by passing ``-c /etc/taler/overrides.conf`` to the - ``taler-config`` commands above. + If you need to change them, you should edit ``/etc/taler/merchant-overrides.conf``, + for example by passing ``-c /etc/taler/merchant-overrides.conf`` to the + ``taler-config`` commands above. By default, the Taler merchant + package when installed on Debian/Ubuntu will use a UNIX domain socket + at ``/run/taler/merchant-httpd/merchant-http.sock``. For the best possible + security, it is recommended to leave this in place and configure a reverse + proxy (nginx or Apache) as described below. + Currency @@ -537,9 +542,9 @@ https://exchange.demo.taler.net/: When using the Debian/Ubuntu packages, these options should be configured in the ``/etc/taler/taler.conf`` configuration file - (alternatively, you can also edit ``/etc/taler/overrides.conf``). - However, you must edit the ``taler.conf`` file manually and must - not use ``taler-config`` to do this, as that would inline the include + (alternatively, you can also edit ``/etc/taler/merchant-overrides.conf``). + However, you must edit the ``taler.conf`` file manually and **must not** + use ``taler-config`` to do this, as that would inline the include directives and destroy the carefully setup path structure. @@ -564,7 +569,8 @@ DBMS-specific options to access the database. When using the Debian/Ubuntu packages, the database should already be configured in the ``/etc/taler/secrets/merchant-db.secret.conf`` configuration file. The ``talermerchant`` database is also already - configured, so you can skip everything in this section. + configured (unless you answered ``no`` when asked the question during + installation), so you can skip everything in this section. For the ``postgres`` backend, you need to provide: @@ -794,10 +800,11 @@ system for how to start and stop daemons. When using the Debian/Ubuntu packages, the systemd configuration will already exist. You only need to enable and start the service - using ``systemctl enable taler-merchant`` and - ``systemctl start taler-merchant``. Additionally, you should - review the ``taler-merchant.conf`` under - ``/etc/{apache2,nginx}/sites-available/``, symlink it to + using ``systemctl enable taler-merchant-httpd`` and + ``systemctl start taler-merchant-httpd``. Additionally, you should + review the ``/etc/apache2/sites-available/taler-merchant.conf`` + or ``/etc/nginx/sites-available/taler-merchant`` (these files + contain additional instructions to follow), symlink it to ``sites-enabled/`` and restart your HTTP server. After that, you should be able to visit the merchant backend at the respective HTTP(S) endpoint. |