searxng instances fix (#25)

There was a confusion between instances and instance which are two different vars in settings.ini

Reviewed-on: #25
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: meaz <meaz@disroot.org>
Co-committed-by: meaz <meaz@disroot.org>
This commit is contained in:
meaz 2024-03-12 19:39:11 +00:00 committed by meaz
parent a53f30722a
commit 5b906cdb6d
4 changed files with 101 additions and 31 deletions

View File

@ -63,7 +63,8 @@ searx_contact_url: 'contact@example.com'
searx_onion_url: 'False'
searx_git_issues: 'https://github.com/{{ searx_or_searxng }}/{{ searx_or_searxng }}/issues'
searx_git_docs: 'https://{{ searx_or_searxng }}.github.io/{{ searx_or_searxng }}'
searx_public_instance: 'https://searx.space'
searx_public_instances: 'https://searx.space'
searx_public_instance: 'false'
searx_git_wiki: 'https://github.com/{{ searx_or_searxng }}/{{ searx_or_searxng }}/wiki'
searx_secretkey: '909cb8a9c66a1ab97bab80010bf8b22b' # run openssl rand -hex 16 to generate new random key
searx_image_proxy: 'true'

View File

@ -6,12 +6,12 @@
- name: Install dependencies
include_tasks: installdeps.yml
- name: Clone git repo
include_tasks: git.yml
- name: Add user
include_tasks: user.yml
- name: Clone git repo
include_tasks: git.yml
- name: Install filtron
include_tasks: filtron.yml
when: searx_or_searxng == 'searx' and searx_filtron == "true"

View File

@ -8,7 +8,11 @@
#
# https://uwsgi-docs.readthedocs.io/en/latest/Options.html#uwsgi-core
# Who will run the code
# Who will run the code / Hint: in emperor-tyrant mode uid & gid setting will be
# ignored [1]. Mode emperor-tyrant is the default on fedora (/etc/uwsgi.ini).
#
# [1] https://uwsgi-docs.readthedocs.io/en/latest/Emperor.html#tyrant-mode-secure-multi-user-hosting
#
uid = {{ searx_username }}
gid = {{ searx_group }}
@ -31,11 +35,6 @@ env = SEARXNG_SETTINGS_PATH={{ searx_config_path }}/settings.yml
# logger = systemd
disable-logging = {{ searx_disable_logging }}
{% if searx_or_searxng == 'searx' %}
# Number of workers (usually CPU count)
workers = {{ searx_workers }}
{% endif %}
# The right granted on the created socket
chmod-socket = {{ searx_chmod_socket }}
@ -58,6 +57,11 @@ plugin = {{ searx_plugin }}
# default behaviour is for performance reasons.
enable-threads = true
{% if searx_or_searxng == 'searx' %}
# Number of workers (usually CPU count)
workers = {{ searx_workers }}
threads = ${UWSGI_THREADS:-4}
{% endif %}
# plugin: python
# --------------

View File

@ -18,7 +18,7 @@ general:
brand:
new_issue_url: {{ searx_git_issues }}/new
docs_url: {{ searx_git_docs }}
public_instances: {{ searx_public_instance }}
public_instances: {{ searx_public_instances }}
wiki_url: {{ searx_git_wiki }}
issue_url: {{ searx_git_issues }}
# custom:
@ -83,7 +83,7 @@ server:
# by ${SEARXNG_URL}.
base_url: false # "http://example.com/location"
limiter: {{ searx_limiter }} # rate limit the number of request on the instance, block some bots
public_instance: {{ searx_public_instance }} # enable features designed only for public instances
# If your instance owns a /etc/searxng/settings.yml file, then set the following
# values there.
@ -198,7 +198,7 @@ outgoing:
#
# Extra seconds to add in order to account for the time taken by the proxy
#
# extra_proxy_timeout: 10.0
# extra_proxy_timeout: 10
#
# uncomment below section only if you have more than one network interface
# which can be the source of outgoing search requests
@ -483,6 +483,12 @@ engines:
# # get your API key from: https://core.ac.uk/api-keys/register/
# api_key: 'unset'
- name: cppreference
engine: cppreference
shortcut: cpp
paging: false
disabled: true
- name: crossref
engine: crossref
shortcut: cr
@ -565,6 +571,16 @@ engines:
require_api_key: false
results: JSON
language: de
tests:
bahnhof:
matrix:
query: berlin
lang: en
result_container:
- not_empty
- ['one_title_contains', 'Berlin Hauptbahnhof']
test:
- unique_results
- name: deezer
engine: deezer
@ -1164,6 +1180,17 @@ engines:
# collection: 'reviews' # name of the db collection
# key: 'name' # key in the collection to search for
- name: mozhi
engine: mozhi
base_url:
- https://mozhi.aryak.me
- https://translate.bus-hit.me
- https://nyc1.mz.ggtyler.dev
# mozhi_engine: google - see https://mozhi.aryak.me for supported engines
timeout: 4.0
shortcut: mz
disabled: true
- name: mwmbl
engine: mwmbl
# api_url: https://api.mwmbl.org
@ -1351,6 +1378,31 @@ engines:
url: https://thepiratebay.org/
timeout: 3.0
- name: pixiv
shortcut: pv
engine: pixiv
disabled: true
inactive: true
pixiv_image_proxies:
- pximg.example.org
# A proxy is required to load the images. Hosting an image proxy server
# for Pixiv:
# --> https://codeberg.org/VnPower/PixivFE/wiki/Hosting-an-image-proxy-server-for-Pixiv
# Proxies from public instances. Ask the public instances owners if they
# agree to receive traffic from SearXNG!
# --> https://codeberg.org/VnPower/PixivFE#instances
# --> https://github.com/searxng/searxng/pull/3192#issuecomment-1941095047
# image proxy of https://pixiv.cat
# - https://i.pixiv.cat
# image proxy of https://www.pixiv.pics
# - https://pximg.cocomi.eu.org
# image proxy of https://pixivfe.exozy.me
# - https://pximg.exozy.me
# image proxy of https://pixivfe.ducks.party
# - https://pixiv.ducks.party
# image proxy of https://pixiv.perennialte.ch
# - https://pximg.perennialte.ch
- name: podcastindex
engine: podcastindex
shortcut: podcast
@ -1427,23 +1479,7 @@ engines:
- name: pypi
shortcut: pypi
engine: xpath
paging: true
search_url: https://pypi.org/search/?q={query}&page={pageno}
results_xpath: /html/body/main/div/div/div/form/div/ul/li/a[@class="package-snippet"]
url_xpath: ./@href
title_xpath: ./h3/span[@class="package-snippet__name"]
content_xpath: ./p
suggestion_xpath: /html/body/main/div/div/div/form/div/div[@class="callout-block"]/p/span/a[@class="link"]
first_page_num: 1
categories: [it, packages]
about:
website: https://pypi.org
wikidata_id: Q2984686
official_api_documentation: https://warehouse.readthedocs.io/api-reference/index.html
use_official_api: false
require_api_key: false
results: HTML
engine: pypi
- name: qwant
qwant_categ: web
@ -1550,7 +1586,7 @@ engines:
- name: internetarchivescholar
engine: internet_archive_scholar
shortcut: ias
timeout: 5.0
timeout: 15.0
- name: superuser
engine: stackexchange
@ -1714,6 +1750,13 @@ engines:
engine: unsplash
shortcut: us
- name: yandex music
engine: yandex_music
shortcut: ydm
disabled: true
# https://yandex.com/support/music/access.html
inactive: true
- name: yahoo
engine: yahoo
shortcut: yh
@ -1833,6 +1876,16 @@ engines:
about:
website: https://species.wikimedia.org/
wikidata_id: Q13679
tests:
wikispecies:
matrix:
query: "Campbell, L.I. et al. 2011: MicroRNAs"
lang: en
result_container:
- not_empty
- ['one_title_contains', 'Tardigrada']
test:
- unique_results
- name: wiktionary
engine: mediawiki
@ -2048,6 +2101,13 @@ engines:
categories: videos
disabled: true
- name: livespace
engine: livespace
shortcut: ls
categories: videos
disabled: true
timeout: 5.0
- name: wordnik
engine: wordnik
shortcut: def
@ -2119,6 +2179,11 @@ engines:
engine: tootfinder
shortcut: toot
- name: voidlinux
engine: voidlinux
shortcut: void
disabled: true
- name: wallhaven
engine: wallhaven
# api_key: abcdefghijklmnopqrstuvwxyz