diff options
| -rw-r--r-- | docs/admin/engines/settings.rst | 4 | ||||
| -rw-r--r-- | docs/admin/installation-searx.rst | 6 | ||||
| -rwxr-xr-x | manage | 6 | ||||
| -rw-r--r-- | searx/settings.yml | 2 | ||||
| -rw-r--r-- | utils/build_env.py | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/docs/admin/engines/settings.rst b/docs/admin/engines/settings.rst index 6a3256357..da5457e8c 100644 --- a/docs/admin/engines/settings.rst +++ b/docs/admin/engines/settings.rst @@ -25,7 +25,7 @@ settings.yml location The initial ``settings.yml`` we be load from these locations: 1. the full path specified in the ``SEARXNG_SETTINGS_PATH`` environment variable. -2. ``/etc/searx/settings.yml`` +2. ``/etc/searxng/settings.yml`` If these files don't exist (or are empty or can't be read), SearXNG uses the :origin:`searx/settings.yml` file. Read :ref:`settings use_default_settings` to @@ -339,7 +339,7 @@ use_default_settings - :ref:`settings location` - :ref:`use_default_settings.yml` - - :origin:`/etc/searx/settings.yml <utils/templates/etc/searx/use_default_settings.yml>` + - :origin:`/etc/searxng/settings.yml <utils/templates/etc/searx/use_default_settings.yml>` The user defined ``settings.yml`` is loaded from the :ref:`settings location` and can relied on the default configuration :origin:`searx/settings.yml` using: diff --git a/docs/admin/installation-searx.rst b/docs/admin/installation-searx.rst index cb3cf9f05..acd2f4579 100644 --- a/docs/admin/installation-searx.rst +++ b/docs/admin/installation-searx.rst @@ -75,16 +75,16 @@ Configuration - :ref:`settings global` - :ref:`settings location` - :ref:`settings use_default_settings` - - :origin:`/etc/searx/settings.yml <utils/templates/etc/searx/use_default_settings.yml>` + - :origin:`/etc/searxng/settings.yml <utils/templates/etc/searx/use_default_settings.yml>` -To create a initial ``/etc/searx/settings.yml`` you can start with a copy of the +To create a initial ``/etc/searxng/settings.yml`` you can start with a copy of the file :origin:`utils/templates/etc/searx/use_default_settings.yml`. This setup :ref:`use default settings <settings use_default_settings>` from :origin:`searx/settings.yml` and is recommended since :pull-searx:`2291` is merged. For a *minimal setup*, configure like shown below – replace ``searx@$(uname -n)`` with a name of your choice, set ``ultrasecretkey`` -- *and/or* edit -``/etc/searx/settings.yml`` to your needs. +``/etc/searxng/settings.yml`` to your needs. .. kernel-include:: $DOCS_BUILD/includes/searx.rst :start-after: START searx config @@ -107,9 +107,9 @@ buildenv() { # settings file from repository's working tree are used by default SEARXNG_SETTINGS_PATH="${REPO_ROOT}/searx/settings.yml" - if [ -r '/etc/searx/settings.yml' ]; then - if ask_yn "should settings read from: /etc/searx/settings.yml"; then - SEARXNG_SETTINGS_PATH='/etc/searx/settings.yml' + if [ -r '/etc/searxng/settings.yml' ]; then + if ask_yn "should settings read from: /etc/searxng/settings.yml"; then + SEARXNG_SETTINGS_PATH='/etc/searxng/settings.yml' fi fi export SEARXNG_SETTINGS_PATH diff --git a/searx/settings.yml b/searx/settings.yml index c2fc32967..c599f04d3 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -36,7 +36,7 @@ server: bind_address: "127.0.0.1" base_url: false # Possible values: false or "https://example.org/location". - # If your instance owns a /etc/searx/settings.yml file, then set the following + # If your instance owns a /etc/searxng/settings.yml file, then set the following # values there. secret_key: "ultrasecretkey" # change this! diff --git a/utils/build_env.py b/utils/build_env.py index 42d75fbfb..cd2fc2d04 100644 --- a/utils/build_env.py +++ b/utils/build_env.py @@ -11,7 +11,7 @@ repo_root = realpath(dirname(realpath(__file__)) + sep + '..') sys.path.insert(0, repo_root) # Assure that the settings file from reposetorie's working tree is used to -# generate the build_env, not from /etc/searx/settings.yml. +# generate the build_env, not from /etc/searxng/settings.yml. os.environ['SEARXNG_SETTINGS_PATH'] = join(repo_root, 'etc', 'settings.yml') def _env(*arg, **kwargs): |