Commit Graph

3141 Commits

Author SHA1 Message Date
Markus Heiser 1cae4fa88d preferences.py: implement defaults if unset
Implemnts defaults for:

- search.default_lang, search.autocomplete, search.safe_search,
- ui.default_theme, ui.default_locale
- server.image_proxy

This fixes also:

  https://github.com/asciimoo/searx/pull/1860#issuecomment-590082955

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-02-23 20:56:05 +01:00
Markus Heiser 179be12732 preferences.py: pylint, SPDX tag & docstrings (no functional change)
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-02-23 20:52:00 +01:00
Markus Heiser 09f4e2cd31
Merge pull request #1846 from piplongrun/autocomplete_swisscows
Add Swisscows autocomplete option
2020-02-23 14:54:10 +00:00
Markus Heiser f272781ab7
Merge branch 'master' into autocomplete_swisscows 2020-02-23 14:43:33 +00:00
Markus Heiser 57efb45ce5
Merge pull request #1773 from Monogramm/docker/opencontainers
📝 Add Opencontainers labels in docker image
2020-02-23 14:43:14 +00:00
Markus Heiser b7105da2af Add missing autocomplete backends to settings.yml comment
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-02-23 15:41:08 +01:00
Markus Heiser 78c5216d76
Merge branch 'master' into autocomplete_swisscows 2020-02-23 14:24:42 +00:00
Markus Heiser 4d67164918 Merge branch 'master' of https://github.com/asciimoo/searx into filtron
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-02-23 13:50:22 +01:00
Markus Heiser 55aa7f96c1
Merge branch 'master' into docker/opencontainers 2020-02-23 11:55:20 +00:00
Markus Heiser 8c26097757
Merge pull request #1842 from piplongrun/engine-etools
Add new eTools.ch engine
2020-02-23 11:52:29 +00:00
Markus Heiser 98322ac15c
Merge branch 'master' into engine-etools 2020-02-23 11:47:49 +00:00
Markus Heiser 90d23e7ef6
Merge pull request #1860 from MarcAbonce/fix-default-locale
Fix default locale and language issues
2020-02-23 11:39:04 +00:00
Markus Heiser 5fb6d4f508 LXC: normalize package installation & user creation.
utils/lib.sh:
- get DIST_ID & DIST_VERSION from /etc/os-release
- pkg_[install|remove|...] supports ubuntu, debian, archlinux & fedora

utils/lxc.sh
- Workaround for the "setrlimit(RLIMIT_CORE): Operation not permitted" error::
    'Set disable_coredump false' >> /etc/sudo.conf

utils/[searx.sh|filtron.sh|morty.sh]
- switched user creation from 'adduser' perl script to 'useradd' built-in
  command

utils/searx.sh
- install packages for ubuntu, debian, archlinux & fedora

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-02-23 12:10:45 +01:00
Marc Abonce Seguin c0006cadf7 fix default locale and language issues 2020-02-23 02:03:42 -07:00
Markus Heiser 2ade2ce10a
Merge pull request #1855 from return42/fix-dead-links
docs: fix dead Searx-instance links to https://searx.space
2020-02-20 18:31:05 +00:00
Markus Heiser a9d184473f docs: fix dead Searx-instance links to https://searx.space
Related to #1853 / BTW update year of copyright note

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-02-20 18:11:34 +01:00
Markus Heiser e36e0f80ae LXC: added archlinux and fedora31 containers
BTW: update all packages when installing conatiner's boilerplate

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-02-18 18:40:34 +01:00
Markus Heiser 0c035c763f Merge branch 'master' of https://github.com/asciimoo/searx into filtron 2020-02-18 18:22:08 +01:00
Markus Heiser ccb96544f7 LXC: improved console messages & prompt
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-02-18 18:20:03 +01:00
Adam Tauber 6df4172887 [fix] allow settin custom locale from settins.yml 2020-02-18 00:56:27 +01:00
Markus Heiser 59e4026762 searx.sh: install settings at /etc/searx/settings.yml
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-02-17 18:58:59 +01:00
Markus Heiser de58f02f6b filtron: add missing log action to the filtron rules
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-02-17 15:36:10 +01:00
Markus Heiser 63b0ba701f Merge branch 'master' of https://github.com/asciimoo/searx into filtron
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-02-17 15:00:58 +01:00
Markus Heiser 0bfc61dbe9 tooling box: misc fixes from lxc tests
Tested by:

  sudo -H ./utils/lxc.sh build containers
  sudo -H ./utils/lxc.sh cmd /share/searx/utils/searx.sh    install all
  sudo -H ./utils/lxc.sh cmd /share/searx/utils/filtron.sh  install all
  sudo -H ./utils/lxc.sh cmd /share/searx/utils/morty.sh    install all

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-02-16 22:29:06 +01:00
Markus Heiser a1f5f2ced8 LXC: minor fixes and renaming
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-02-16 22:26:03 +01:00
Markus Heiser ad32739860 shellcheck: fix usse -n instead of ! -z (SC2236 SC2237)
- https://www.shellcheck.net/wiki/SC2236 -- Use -n instead of ! -z.
 - https://www.shellcheck.net/wiki/SC2237 -- Use [ -n .. ] instead of ! [ -z ....

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-02-16 20:07:37 +01:00
Markus Heiser e8cf225046 LXC: tooling box - add boilerplate to containers
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-02-16 18:18:15 +01:00
Markus Heiser ab2f56e886
Merge pull request #1843 from dalf/searx_space
[mod] move public instance list to https://searx.space
2020-02-15 09:06:37 +00:00
piplongrun b136480546
Add Swisscows autocomplete option 2020-02-14 19:19:24 +01:00
Dalf 88f9ac58f4 [mod] move public instance list to https://searx.space 2020-02-14 13:48:44 +01:00
Markus Heiser 0b2b325552 LXC: tooling box - add HOST shares and commandline to containers (WIP)
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-02-13 18:25:03 +01:00
piplongrun e1b60106b7
Add etools engine to the list 2020-02-12 23:59:18 +01:00
piplongrun f0684a5bb5
Add eTools engine 2020-02-12 23:58:50 +01:00
Markus Heiser e6bf2038c3 filtron.sh: add 'install rules' command
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-02-11 15:58:35 +01:00
Markus Heiser 0d6153db12 filtron.sh: updated rules from production
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-02-11 15:57:42 +01:00
Markus Heiser 7751b29559 LXC: add LXC tooling box (initial, WIP)
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-02-08 19:12:28 +01:00
Markus Heiser 5c0f9c8c79 tooling box: varius fix from tests
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-02-08 17:12:01 +01:00
Markus Heiser db5815d3d8 Merge branch 'master' of https://github.com/asciimoo/searx into filtron 2020-02-08 15:55:04 +01:00
Markus Heiser 7f224713e5
Merge pull request #1621 from nfk/locale
Fix regional settings #844
2020-02-08 14:54:22 +00:00
Markus Heiser 7c79eb9b1b Merge commit 'refs/pull/1621/head' of https://github.com/asciimoo/searx
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-02-08 15:08:33 +01:00
Markus Heiser 50b070c5d3 Merge pull request #1835 from dalf/uwsgi_fix
[fix] Disable HTTP keep alive
2020-02-08 12:52:22 +00:00
Markus Heiser 3f127b6c95
Merge branch 'master' into uwsgi_fix 2020-02-08 12:47:56 +00:00
Markus Heiser ed4cb4f160 tooling box: varius fix from tests 2020-02-08 13:24:08 +01:00
Markus Heiser c8212b9f4d Merge branch 'master' of https://github.com/asciimoo/searx into filtron 2020-02-08 13:07:45 +01:00
Markus Heiser 3062e2adf9 Merge pull request #1823 from kvch/make-engines-private
Thanks! .. excellent work, I see you on #1836 :)
2020-02-08 12:04:42 +00:00
Noémi Ványi 99435381a8 [enh] introduce private engines
This PR adds a new setting to engines named `tokens`.
It expects a list of tokens which lets searx validate
if the request should be accepted or not.
2020-02-08 11:47:39 +01:00
Dalf 0579d93783 [fix] Disable HTTP keep alive
Fix HTTP 429 response from filtron
See https://github.com/searx/searx-docker/issues/24
2020-02-07 19:16:15 +01:00
Adam Tauber f9c7a678d2 [doc] fix rst format to be able to upload the package to pypi 2020-02-07 12:00:45 +01:00
Adam Tauber ab1b1ac358
Merge pull request #1831 from nfk/nicofonk/fix/werkzeug_import
Fix deprecated werkzeug import
2020-02-06 21:58:42 +00:00
Nicolas Gelot b8b13372c8 Fix deprecated werkzeug import
Close: #1830
Signed-off-by: Nicolas Gelot <nicolas.gelot@e.email>
2020-02-06 22:49:35 +01:00