diff options
| author | Markus Heiser <markus.heiser@darmarit.de> | 2020-04-09 15:04:23 +0200 |
|---|---|---|
| committer | Markus Heiser <markus.heiser@darmarit.de> | 2020-04-09 15:04:23 +0200 |
| commit | ebde9d10fd84de74ea99385dae4d95bcf932bcf3 (patch) | |
| tree | 3e10e967abd666d5ec000b9d66ce9a00b1e52c57 /docs/admin | |
| parent | 44edc9256932961f5fd3c0778da009c493d9ce35 (diff) | |
docs: proofreading of all the installation topics
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Diffstat (limited to 'docs/admin')
| -rw-r--r-- | docs/admin/architecture.rst | 14 | ||||
| -rw-r--r-- | docs/admin/installation-apache.rst | 16 | ||||
| -rw-r--r-- | docs/admin/installation-nginx.rst | 8 | ||||
| -rw-r--r-- | docs/admin/installation-uwsgi.rst | 2 | ||||
| -rw-r--r-- | docs/admin/installation.rst | 2 | ||||
| -rw-r--r-- | docs/admin/morty.rst | 4 |
6 files changed, 38 insertions, 8 deletions
diff --git a/docs/admin/architecture.rst b/docs/admin/architecture.rst index fbc3bf483..464e765eb 100644 --- a/docs/admin/architecture.rst +++ b/docs/admin/architecture.rst @@ -4,12 +4,14 @@ Architecture ============ -.. sidebar:: Tooling box - - - :ref:`searx & uwsgi <searx.sh>` - - :ref:`filtron <filtron.sh>` - - :ref:`reverse proxy` - - :ref:`morty <morty.sh>` +.. sidebar:: Further reading + + - Reverse Proxy: :ref:`Apache <apache searx site>` & :ref:`nginx <nginx searx + site>` + - Filtron: :ref:`searx filtron` + - Morty: :ref:`searx morty` + - uWSGI: :ref:`searx uwsgi` + - Searx: :ref:`installation basic` Herein you will find some hints and suggestions about typical architectures of searx infrastructures. diff --git a/docs/admin/installation-apache.rst b/docs/admin/installation-apache.rst index 0b6cc38df..217e57718 100644 --- a/docs/admin/installation-apache.rst +++ b/docs/admin/installation-apache.rst @@ -45,6 +45,22 @@ Install with apache :local: :backlinks: entry +---- + +**Install** :ref:`apache searx site` using :ref:`filtron.sh <filtron.sh overview>` + +.. code:: bash + + $ sudo -H ./utils/filtron.sh apache install + +**Install** :ref:`apache searx site` using :ref:`morty.sh <morty.sh overview>` + +.. code:: bash + + $ sudo -H ./utils/morty.sh apache install + +---- + The apache HTTP server ====================== diff --git a/docs/admin/installation-nginx.rst b/docs/admin/installation-nginx.rst index b02c555f6..e62c60df6 100644 --- a/docs/admin/installation-nginx.rst +++ b/docs/admin/installation-nginx.rst @@ -19,6 +19,14 @@ Install with nginx .. _SCRIPT_NAME: https://werkzeug.palletsprojects.com/en/1.0.x/wsgi/#werkzeug.wsgi.get_script_name +.. sidebar:: further reading + + - nginx_ + - `nginx beginners guide`_ + - `nginx server configuration`_ + - `Getting Started wiki`_ + - `uWSGI support from nginx`_ + .. contents:: Contents :depth: 2 :local: diff --git a/docs/admin/installation-uwsgi.rst b/docs/admin/installation-uwsgi.rst index 67a8e127a..72498c0bf 100644 --- a/docs/admin/installation-uwsgi.rst +++ b/docs/admin/installation-uwsgi.rst @@ -4,7 +4,7 @@ uwsgi ===== -.. sidebar:: further read +.. sidebar:: further reading - `systemd.unit`_ - `uWSGI Emperor`_ diff --git a/docs/admin/installation.rst b/docs/admin/installation.rst index 81fc4d3e2..bfc0742de 100644 --- a/docs/admin/installation.rst +++ b/docs/admin/installation.rst @@ -31,7 +31,7 @@ and some maintenance tasks (alternatively you can create your own fork). .. code:: bash - $ cd ~/Download + $ cd ~/Downloads $ git clone https://github.com/asciimoo/searx searx $ cd searx diff --git a/docs/admin/morty.rst b/docs/admin/morty.rst index 48ff5b9c4..2858fde3c 100644 --- a/docs/admin/morty.rst +++ b/docs/admin/morty.rst @@ -5,6 +5,10 @@ How to setup result proxy ========================= +.. sidebar:: further reading + + - :ref:`morty.sh` + .. _morty: https://github.com/asciimoo/morty .. _morty's README: https://github.com/asciimoo/morty |