diff options
author | Markus Heiser <markus.heiser@darmarit.de> | 2024-01-07 18:33:34 +0100 |
---|---|---|
committer | Markus Heiser <markus.heiser@darmarIT.de> | 2024-01-09 16:31:19 +0100 |
commit | f9c5727ddc74b9ee3bb95225c30f57c7aeb14806 (patch) | |
tree | 9cda98183b0efcbca8ba45b53d9502a36a0201a3 /docs | |
parent | 60bc5baea31c24a72cfb4f45322e326cc62caf23 (diff) | |
download | searxng-f9c5727ddc74b9ee3bb95225c30f57c7aeb14806.tar.gz searxng-f9c5727ddc74b9ee3bb95225c30f57c7aeb14806.zip |
[mod] get rid of ./utils/brand.env and its workflow
All the environments defined in ./utils/brand.env are generated on the fly, so
there is no longer a need to define the brand environment in this file and all
the workflows to handle this file.
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Diffstat (limited to 'docs')
-rw-r--r-- | docs/admin/settings/settings_server.rst | 10 | ||||
-rw-r--r-- | docs/dev/makefile.rst | 73 |
2 files changed, 5 insertions, 78 deletions
diff --git a/docs/admin/settings/settings_server.rst b/docs/admin/settings/settings_server.rst index e4e66ee2f..b1b3a14f7 100644 --- a/docs/admin/settings/settings_server.rst +++ b/docs/admin/settings/settings_server.rst @@ -21,17 +21,13 @@ X-Robots-Tag : noindex, nofollow Referrer-Policy : no-referrer -``base_url`` : ``$SEARXNG_URL`` :ref:`buildenv <make buildenv>` +``base_url`` : ``$SEARXNG_URL`` The base URL where SearXNG is deployed. Used to create correct inbound links. - If you change the value, don't forget to rebuild instance's environment - (:ref:`utils/brand.env <make buildenv>`) -``port`` & ``bind_address``: ``$SEARXNG_PORT`` & ``$SEARXNG_BIND_ADDRESS`` :ref:`buildenv <make buildenv>` +``port`` & ``bind_address``: ``$SEARXNG_PORT`` & ``$SEARXNG_BIND_ADDRESS`` Port number and *bind address* of the SearXNG web application if you run it directly using ``python searx/webapp.py``. Doesn't apply to a SearXNG - services running behind a proxy and using socket communications. If you - change the value, don't forget to rebuild instance's environment - (:ref:`utils/brand.env <make buildenv>`) + services running behind a proxy and using socket communications. ``secret_key`` : ``$SEARXNG_SECRET`` Used for cryptography purpose. diff --git a/docs/dev/makefile.rst b/docs/dev/makefile.rst index 8f29dd252..3c3b2bf3b 100644 --- a/docs/dev/makefile.rst +++ b/docs/dev/makefile.rst @@ -61,13 +61,9 @@ working tree and release a ``make install`` to get a virtualenv with a $ make install PYENV [virtualenv] installing ./requirements*.txt into local/py3 ... - PYENV OK PYENV [install] pip install -e 'searx[test]' ... - Successfully installed argparse-1.4.0 searx - BUILDENV INFO:searx:load the default settings from ./searx/settings.yml - BUILDENV INFO:searx:Initialisation done - BUILDENV build utils/brand.env + Successfully installed searxng-2023.7.19+a446dea1b If you release ``make install`` multiple times the installation will only rebuild if the sha256 sum of the *requirement files* fails. With other words: @@ -82,13 +78,9 @@ the check fails if you edit the requirements listed in ... PYENV [virtualenv] installing ./requirements*.txt into local/py3 ... - PYENV OK PYENV [install] pip install -e 'searx[test]' ... - Successfully installed argparse-1.4.0 searx - BUILDENV INFO:searx:load the default settings from ./searx/settings.yml - BUILDENV INFO:searx:Initialisation done - BUILDENV build utils/brand.env + Successfully installed searxng-2023.7.19+a446dea1b .. sidebar:: drop environment @@ -98,67 +90,6 @@ the check fails if you edit the requirements listed in If you think, something goes wrong with your ./local environment or you change the :origin:`setup.py` file, you have to call :ref:`make clean`. -.. _make buildenv: - -``make buildenv`` -================= - -Rebuild instance's environment with the modified settings from the -:ref:`settings brand` and :ref:`settings server` section of your -:ref:`settings.yml <settings location>`. - - What is the :origin:`utils/brand.env` needed for and why do you need to rebuild - it if necessary? - - Short answer: :ref:`installation and maintenance <searxng maintenance>` - scripts are running outside of instance's runtime environment and need some - values defined in the runtime environment. - -All the SearXNG setups are centralized in the :ref:`settings.yml` file. This -setup is available as long we are in a *installed instance*. E.g. the -*installed instance* on the server or the *installed developer instance* at -``./local`` (the later one is created by a :ref:`make install <make install>` or -:ref:`make run <make run>`). - -Tasks running outside of an *installed instance*, especially :ref:`installation -and maintenance <searxng maintenance>` tasks running at (pre-) installation time -do not have access to the SearXNG setup (from a *installed instance*). Those -tasks need a *build environment*. - -The ``make buildenv`` target will update the *build environment* in: - -- :origin:`utils/brand.env` - -Tasks running outside of an *installed instance*, need the following settings -from the YAML configuration: - -- ``SEARXNG_URL`` from :ref:`server.base_url <settings server>` (aka - ``PUBLIC_URL``) -- ``SEARXNG_BIND_ADDRESS`` from :ref:`server.bind_address <settings server>` -- ``SEARXNG_PORT`` from :ref:`server.port <settings server>` - -The ``GIT_URL`` and ``GIT_BRANCH`` in the origin:`utils/brand.env` file, are -read from the git VCS and the branch that is checked out when ``make -buildenv`` command runs. - -.. _brand: - -**I would like to create my own brand, how should I proceed?** - -Create a remote branch (``example.org``), checkout the remote branch (on your -local developer desktop) and in the :origin:`searx/settings.yml` file in the -:ref:`settings server` section set ``base_url``. Run ``make buildenv`` and -create a commit for your brand. - -On your server you clone the branch (``example.org``) into your HOME folder -``~`` from where you run the :ref:`installation <installation>` and -:ref:`maintenance <searxng maintenance>` task. - -To upgrade you brand, rebase on SearXNG's master branch (on your local -developer desktop), force push it to your remote branch. Go to your server, do -a force pull and run :ref:`sudo -H ./utils/searxng.sh instance update <update -searxng>`. - .. _make node.env: Node.js environment (``make node.env``) |