diff options
| author | Alexandre Flament <alex@al-f.net> | 2021-07-30 18:57:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-30 18:57:00 +0200 |
| commit | 38ee88b3905148460e30982715277e7b30857629 (patch) | |
| tree | 61cf8004cc09fefeffaafb082b8ce86a1c959da4 /docs | |
| parent | 3b97657f3bbe9bd84a99d46ad1e26391d62ba496 (diff) | |
| parent | 5b3eeb6e54d4b88adccdf847c32d8102ff6202a5 (diff) | |
Merge pull request #229 from dalf/version-from-git
version based on git
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/conf.py | 4 | ||||
| -rw-r--r-- | docs/dev/makefile.rst | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/docs/conf.py b/docs/conf.py index 04c8aa205..978d6a660 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -5,7 +5,7 @@ import sys, os from pallets_sphinx_themes import ProjectLink from searx import get_setting -from searx.version import VERSION_STRING +from searx.version import VERSION_STRING, GIT_URL, GIT_BRANCH # Project -------------------------------------------------------------- @@ -15,8 +15,6 @@ author = u'Adam Tauber' release, version = VERSION_STRING, VERSION_STRING SEARX_URL = get_setting('server.base_url') or 'https://example.org/searx' -GIT_URL = get_setting('brand.git_url') -GIT_BRANCH = get_setting('brand.git_branch') ISSUE_URL = get_setting('brand.issue_url') DOCS_URL = get_setting('brand.docs_url') PUBLIC_INSTANCES = get_setting('brand.public_instances') diff --git a/docs/dev/makefile.rst b/docs/dev/makefile.rst index 5bf3c13b2..0b5af3cd8 100644 --- a/docs/dev/makefile.rst +++ b/docs/dev/makefile.rst @@ -107,8 +107,8 @@ The ``make buildenv`` target will update the *build environment* in: Tasks running outside of an *installed instance*, need the following settings from the YAML configuration: -- ``GIT_URL`` from :ref:`brand.git_url <settings global brand>` -- ``GIT_BRANCH`` from :ref:`brand.git_branch <settings global brand>` +- ``GIT_URL`` from git configuration +- ``GIT_BRANCH`` from git configuration - ``SEARX_URL`` from :ref:`server.base_url <settings global server>` (aka ``PUBLIC_URL``) |