# HG changeset patch # User Mads Kiilerich # Date 2020-08-13 17:04:00 # Node ID 4d742b172010d5a58d3e371bf340ae1b5263b83b # Parent 933d25793167a48ea12894efd76f121d90394c1c docs: front-end-build is actually a part of the install process - it is shared among all the instances diff --git a/docs/installation.rst b/docs/installation.rst --- a/docs/installation.rst +++ b/docs/installation.rst @@ -59,7 +59,7 @@ repository, use the following commands i pip install --upgrade -e . python3 setup.py compile_catalog # for translation of the UI -You can now proceed to :ref:`setup`. +You can now proceed to :ref:`install-front-end`. .. _installation-virtualenv: @@ -114,7 +114,7 @@ An additional benefit of virtualenv is t - This will install Kallithea together with all other required Python libraries into the activated virtualenv. -You can now proceed to :ref:`setup`. +You can now proceed to :ref:`install-front-end`. .. _installation-without-virtualenv: @@ -133,4 +133,18 @@ To install as a regular user in ``~/.loc pip install --user kallithea +You can now proceed to :ref:`install-front-end`. + +.. _install-front-end: + + +Prepare front-end files +----------------------- + +Finally, the front-end files must be prepared. This requires ``npm`` version 6 +or later, which needs ``node.js`` (version 12 or later). Prepare the front-end +by running:: + + kallithea-cli front-end-build + You can now proceed to :ref:`setup`. diff --git a/docs/overview.rst b/docs/overview.rst --- a/docs/overview.rst +++ b/docs/overview.rst @@ -20,20 +20,20 @@ 1. **Prepare environment and external de 2. **Install Kallithea software.** This makes the ``kallithea-cli`` command line tool available. -3. **Create low level configuration file.** +3. **Prepare front-end files** + Some front-end files must be fetched or created using ``npm`` tooling so + they can be served to the client as static files. + +4. **Create low level configuration file.** Use ``kallithea-cli config-create`` to create a ``.ini`` file with database connection info, mail server information, configuration for the specified web server, etc. -4. **Populate the database.** +5. **Populate the database.** Use ``kallithea-cli db-create`` with the ``.ini`` file to create the database schema and insert the most basic information: the location of the repository store and an initial local admin user. -5. **Prepare front-end files** - Some front-end files must be fetched or created using ``npm`` tooling so - they can be served to the client as static files. - 6. **Configure the web server.** The web server must invoke the WSGI entrypoint for the Kallithea software using the ``.ini`` file (and thus the database). This makes the web diff --git a/docs/setup.rst b/docs/setup.rst --- a/docs/setup.rst +++ b/docs/setup.rst @@ -93,15 +93,6 @@ path to the root). sudo -u postgres createdb 'kallithea' --owner 'kallithea' kallithea-cli db-create -c my.ini --reuse -Prepare front-end files -^^^^^^^^^^^^^^^^^^^^^^^ - -Finally, the front-end files must be prepared. This requires ``npm`` version 6 -or later, which needs ``node.js`` (version 12 or later). Prepare the front-end -by running:: - - kallithea-cli front-end-build - Running ^^^^^^^