Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43ce553a authored by Nivesh Krishna's avatar Nivesh Krishna
Browse files

Merge branch 'fix-settings' into 'master'

remove digg and openverse

Closes backlog#1186

See merge request !152
parents 2d3f21a4 8ef394c7
Loading
Loading
Loading
Loading
+9 −23
Original line number Original line Diff line number Diff line
@@ -71,11 +71,11 @@ ui:
#    key : !!binary "your_morty_proxy_key"
#    key : !!binary "your_morty_proxy_key"


outgoing: # communication with search engines
outgoing: # communication with search engines
    request_timeout : 6.0 # default timeout in seconds, can be override by engine
    request_timeout : 3.0 # default timeout in seconds, can be override by engine
    # max_request_timeout: 10.0 # the maximum timeout in seconds
    # max_request_timeout: 10.0 # the maximum timeout in seconds
    useragent_suffix : "" # suffix of searx_useragent, could contain informations like an email address to the administrator
    useragent_suffix : "" # suffix of searx_useragent, could contain informations like an email address to the administrator
    pool_connections : 100 # The maximum number of concurrent connections that may be established.
    pool_connections : 200 # The maximum number of concurrent connections that may be established.
    pool_maxsize : 20 # Allow the connection pool to maintain keep-alive connections below this point.
    pool_maxsize : 40 # Allow the connection pool to maintain keep-alive connections below this point.
    enable_http2: True  # See https://www.python-httpx.org/http2/
    enable_http2: True  # See https://www.python-httpx.org/http2/
    keepalive_expiry: 5.0
    keepalive_expiry: 5.0
    source_ips: []
    source_ips: []
@@ -233,7 +233,6 @@ engines:
    engine : wikipedia
    engine : wikipedia
    shortcut : wp
    shortcut : wp
    base_url : 'https://{language}.wikipedia.org/'
    base_url : 'https://{language}.wikipedia.org/'
    disabled: True


    #The fulltext and title parameter is necessary for Wikimini because sometimes it will not show the results and redirect instead
    #The fulltext and title parameter is necessary for Wikimini because sometimes it will not show the results and redirect instead
  - name: wikimini
  - name: wikimini
@@ -290,11 +289,6 @@ engines:
      require_api_key: false
      require_api_key: false
      results: HTML
      results: HTML


  - name : btdigg
    engine : btdigg
    shortcut : bt
    disabled : True

  - name : ccc-tv
  - name : ccc-tv
    engine : xpath
    engine : xpath
    paging : False
    paging : False
@@ -317,6 +311,7 @@ engines:
    engine: openverse
    engine: openverse
    categories: images
    categories: images
    shortcut: opv
    shortcut: opv
    disabled: True


# - name : core.ac.uk
# - name : core.ac.uk
#   engine : core
#   engine : core
@@ -374,10 +369,6 @@ engines:
#    timeout : 6.0
#    timeout : 6.0
#    disabled : True
#    disabled : True


  - name : digg
    engine : digg
    shortcut : dg

  - name : erowid
  - name : erowid
    engine : xpath
    engine : xpath
    paging : True
    paging : True
@@ -421,6 +412,7 @@ engines:
  - name: wikidata
  - name: wikidata
    engine: wikidata
    engine: wikidata
    shortcut: wd
    shortcut: wd
    timeout: 3.0
    weight: 2
    weight: 2
    tests: *tests_infobox
    tests: *tests_infobox


@@ -470,12 +462,6 @@ engines:
      require_api_key: false
      require_api_key: false
      results: HTML
      results: HTML


  - name : ebay
    engine : ebay
    shortcut : eb
    disabled : True
    timeout: 5

  - name : 1x
  - name : 1x
    engine : www1x
    engine : www1x
    shortcut : 1x
    shortcut : 1x