[taler-docs] branch master updated (678c18f -> b35bb74)

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a change to branch master
in repository docs.

    from 678c18f  replace ‘code-block:: console’ w/ :ref:
     new 1ae896e  ubuntu instructions
     new 9fa2be0  merge conflict
     new b35bb74  add Ubuntu instructions for merchant

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 frags/installing-ubuntu.rst | 37 +++++++++++++++++++++++++++++++++++++
 index.rst                   |  2 +-
 taler-exchange-manual.rst   | 21 +++++++++++++++++++++
 taler-merchant-manual.rst   | 19 +++++++++++++++++++
 4 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 frags/installing-ubuntu.rst

diff --git a/frags/installing-ubuntu.rst b/frags/installing-ubuntu.rst
new file mode 100644
index 0000000..a72579d
--- /dev/null
+++ b/frags/installing-ubuntu.rst
@@ -0,0 +1,37 @@
+To install the GNU Taler Ubuntu packages, first ensure that you have
+the right Ubuntu distribution. At this time, the packages are built for
+Ubuntu 20.04 LTS (Focal Fossa).
+
+A typical ``/etc/apt/sources.list`` file for this setup
+would look like this:
+
+.. code-block::
+
+   deb http://ch.archive.ubuntu.com/ubuntu/ focal main restricted
+   deb http://ch.archive.ubuntu.com/ubuntu/ focal-updates main restricted
+   deb http://ch.archive.ubuntu.com/ubuntu/ focal-security main restricted
+   deb http://ch.archive.ubuntu.com/ubuntu/ focal universe restricted
+   deb http://ch.archive.ubuntu.com/ubuntu/ focal-updates universe restricted
+   deb http://ch.archive.ubuntu.com/ubuntu/ focal-security universe restricted
+   deb http://ch.archive.ubuntu.com/ubuntu/ focal multiverse restricted
+   deb http://ch.archive.ubuntu.com/ubuntu/ focal-updates multiverse restricted
+   deb http://ch.archive.ubuntu.com/ubuntu/ focal-security multiverse 
restricted
+
+   deb https://deb.taler.net/apt/ubuntu/ focal-fossa main
+
+The last line is crucial, as it adds the GNU Taler packages.
+
+Next, you must import the Taler Systems SA public package signing key
+into your keyring and update the package lists:
+
+.. code-block:: console
+
+   # wget -O - https://taler.net/static/taler-systems.gpg.key | apt-sign add -
+   # apt update
+
+.. note::
+
+   You may want to verify the correctness of the Taler Systems key out-of-band.
+
+Now your system is ready to install the official GNU Taler binary packages
+using apt.
diff --git a/index.rst b/index.rst
index 9486220..5fa291f 100644
--- a/index.rst
+++ b/index.rst
@@ -60,7 +60,7 @@ Documentation Overview
   taler-bank-manual
   taler-backoffice-manual
   taler-auditor-manual
-  taler-developer-manual.rst
+  taler-developer-manual
   taler-wallet
   design-documents/index
   anastasis
diff --git a/taler-exchange-manual.rst b/taler-exchange-manual.rst
index 7d6703a..a2cab43 100644
--- a/taler-exchange-manual.rst
+++ b/taler-exchange-manual.rst
@@ -331,6 +331,27 @@ Sample configuration files for the HTTP reverse proxy can 
be found in
 ``/etc/taler-exchange/``.
 
 
+Installing the GNU Taler binary packages on Ubuntu
+--------------------------------------------------
+
+.. include:: frags/installing-ubuntu.rst
+
+To install the Taler exchange, you can now simply run:
+
+.. code-block:: console
+
+   # apt install taler-exchange
+
+Note that the package does not perform any configuration work except for
+setting up the various users and the systemd service scripts. You still must
+configure at least the database, HTTP reverse proxy (typically with TLS
+certificates), denomination and fee structure, bank account, auditor(s),
+offline signing and the terms of service.
+
+Sample configuration files for the HTTP reverse proxy can be found in
+``/etc/taler-exchange/``.
+
+
 Configuration
 =============
 
diff --git a/taler-merchant-manual.rst b/taler-merchant-manual.rst
index 283512d..ad8b513 100644
--- a/taler-merchant-manual.rst
+++ b/taler-merchant-manual.rst
@@ -394,6 +394,25 @@ furthermore still configure the instances, and may need to 
extend the fragment
 with access control restrictions for non-default instances.
 
 
+Installing the GNU Taler binary packages on Ubuntu
+--------------------------------------------------
+
+.. include:: frags/installing-ubuntu.rst
+
+To install the Taler merchant backend, you can now simply run:
+
+.. code-block:: console
+
+   # apt install taler-merchant
+
+Note that the package does not complete the integration of the backend with
+the HTTP reverse proxy (typically with TLS certificates).  A configuration
+fragment for Nginx or Apache will be placed in
+``/etc/{apache,nginx}/conf-available/taler-merchant.conf``.  You must
+furthermore still configure the instances, and may need to extend the fragment
+with access control restrictions for non-default instances.
+
+
 .. _Installing-Taler-on-Debian-GNU_002fLinux:
 
 Installing Taler on Debian GNU/Linux from source

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.