retoor/searxng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,320 Commits 6 Branches 17 Tags
0b4e20ba9a0dac66b5f3b0d0c8ab21434df14dfd
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Heiser 0b4e20ba9a Merge pull request #1950 from return42/about-opensearch 
[fix] about page- 'How to set as the default search engine?'
 2020-06-26 08:47:14 +00:00
Markus Heiser 5f201dea7d Merge branch 'master' into about-opensearch 2020-06-26 08:33:37 +00:00
Markus Heiser 5293e58032 [fix] yahoo engine - changed content_xpath 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-06-25 21:45:42 +02:00
Markus Heiser a059c59cea Merge branch 'master' into about-opensearch 2020-06-25 05:42:11 +00:00
Markus Heiser ccb1fe11d7 Merge pull request #2016 from dalf/proxify-dataurl 
[mod] don't try to proxify data URL.
 2020-06-24 17:13:03 +00:00
Markus Heiser 34264f0b0a Merge branch 'master' into proxify-dataurl 2020-06-24 17:07:05 +00:00
Markus Heiser 1db37a0cc3 Merge branch 'master' into about-opensearch 2020-06-19 04:51:29 +00:00
Markus Heiser 0616684baa [fix] sphinx 3.1 CSS issues 
See sphinx-doc project, PR 7838 & 7484 with elementary patch to the basic CSS:

- https://github.com/sphinx-doc/sphinx/issues/7838#issuecomment-646009605
- https://github.com/sphinx-doc/sphinx/pull/7484#issuecomment-646058972

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-06-18 19:02:22 +02:00
Markus Heiser a5e82f9801 [fix] margial typo in docs/user/onf.py doc-string 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-06-18 18:57:10 +02:00
Markus Heiser bfef2c3b65 [fix] buildprocess of docs in LXC (containers) 
The $DOCS_BUILD variable (like all BUILD variables) in the lxc environment::

   sudo -H ./utils/lxc.sh cmd searx-archlinux make docs

is different from running build process in the HOST::

   make docs

with kernel-include directive we can use the environment variables in the reST
documents to address the correct file location of the include.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-06-18 18:52:45 +02:00
Markus Heiser aa5f947157 [enh] add 'kernel-include' reST-directive 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-06-18 18:51:31 +02:00
Markus Heiser 15924bcb67 [fix] buildprocess of the docs by adding sphinx-doc-prebuilds target 
The sphinx-doc-prebuilds is the single point of definition for prerequisites
each doc build needs

BTW: remove $(LXC_ENV_FOLDER) offset from BOOKS_FOLDER and DOCS_FOLDER path.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-06-18 18:44:22 +02:00
Markus Heiser 4f7a6c09dd [fix] buildhosts documentation 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-06-18 18:39:56 +02:00
Markus Heiser 51428de0fe [fix] add missing latexmk package to debian's BUILD_PACKAGES 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-06-18 18:35:59 +02:00
Markus Heiser 6ff20cef73 [fix] indentation of filtron's rules (json) 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-06-18 18:31:46 +02:00
Markus Heiser 59739a44db Merge branch 'master' into about-opensearch 2020-06-16 07:37:06 +00:00
Markus Heiser dda4a46f8e Merge branch 'master' into filtron 2020-06-16 05:56:12 +00:00
Markus Heiser e2770b5871 Merge branch 'master' into filtron 2020-06-12 05:36:23 +00:00
Markus Heiser 09c6fe8d4b Merge branch 'master' into about-opensearch 2020-06-12 05:34:35 +00:00
Markus Heiser 6fb5c6aad9 Merge pull request #1992 from return42/2c6531b2-hotfix 
[fix] commit 2c6531b2 breaks the unit test, this is a hotfix
 2020-06-12 05:32:46 +00:00
Markus Heiser eae3481688 [fix] commit 2c6531b2 breaks the unit test, this is a hotfix 
commit 2c6531b2 does not only break the unit test, it is a significant change of
the data model and the searx search-syntax model (UI) without any discussion nor
documentation.

At the end, adding routes to instant answers is a nice feature but commit
2c6531b2 leaf some questions open.

In that sense, this patch is only a hotfix not a assessment.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-06-11 10:15:15 +02:00
Markus Heiser 4496ad1218 Merge branch 'master' into filtron 2020-06-10 04:55:41 +00:00
Markus Heiser cc82303b62 Merge branch 'master' into about-opensearch 2020-06-10 04:55:04 +00:00
Markus Heiser 2b1f73ad49 Merge branch 'master' into about-opensearch 2020-06-09 08:29:48 +00:00
Markus Heiser 28181ba34f Merge branch 'master' of https://github.com/asciimoo/searx into filtron 2020-06-09 10:20:20 +02:00
Markus Heiser 1fc0e9ddc5 Merge branch 'master' of https://github.com/asciimoo/searx into filtron 2020-06-04 21:22:53 +02:00
Markus Heiser 2b2a882df0 Merge branch 'master' into filtron 2020-06-03 16:33:06 +00:00
Markus Heiser b85d845636 Merge branch 'master' of https://github.com/asciimoo/searx into about-opensearch 2020-06-01 09:43:19 +02:00
Markus Heiser 6fc26775e4 Merge branch 'master' of https://github.com/asciimoo/searx into filtron 2020-06-01 09:25:30 +02:00
Markus Heiser d38952c133 Merge pull request #1963 from KazamaSion/master 
Revise outdated URLs
 2020-05-28 11:18:53 +00:00
Markus Heiser d44b034817 Merge branch 'master' into master 2020-05-28 11:09:15 +00:00
Markus Heiser e62ac42259 Merge pull request #1971 from resynth1943/master 
Add autofocus to all search inputs
 2020-05-28 11:05:18 +00:00
Markus Heiser f576cadfba [fix] installation instructions: pip install -e searx (setup.py) 
In the past we did not really install searx into the virtualenv.  This is a
problem, since entry-points and other python installation stuff is not trigger.

See discussion: https://github.com/asciimoo/searx/pull/1938#issuecomment-632056508

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-05-21 15:46:43 +02:00
Markus Heiser fcc5af66d8 [fix] disable debug in settings.yml by default 
debug was accidentally enabled in commit cbc08fd

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-05-21 15:16:49 +02:00
Markus Heiser e7788980ad [fix] about page- 'How to set as the default search engine?' 
Searx supports OpenSearch, remove the inline JS from the about page.

close: https://github.com/asciimoo/searx/issues/1949
close: https://github.com/asciimoo/searx/issues/1616

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-05-12 14:17:47 +02:00
Markus Heiser 9c08adf6f2 Merge branch 'master' of https://github.com/asciimoo/searx into filtron 2020-05-11 08:57:16 +02:00
Markus Heiser e50ccc99c0 archlinux: add package 'inetutils' to boilerplate 
Even it is a core component, some hoster do not have pre installed the
'inetutils' package.  We do need this package for the 'hostname' command.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-05-04 16:15:23 +02:00
Markus Heiser f42bc330b8 Merge branch 'master' into filtron 2020-05-01 13:35:12 +00:00
Markus Heiser 0973255aff [fix] fatal: repository '/root/searx' does not exist 
The $SERVICE_USER (searx) needs read permission to clone repository.  The
installation script stops if permission is not granted.

- https://github.com/asciimoo/searx/pull/1803#issuecomment-616406528

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-30 17:49:26 +02:00
Markus Heiser d27331c8d9 Merge pull request #1479 from milouse/fix/manage.sh 
fix: Remove english shell dependency in manage.sh script
 2020-04-29 13:01:09 +00:00
Markus Heiser 4bae1a9eab Merge branch 'master' into fix/manage.sh 2020-04-29 12:55:13 +00:00
Markus Heiser ceceee546b [fix] Remove english shell dependency in manage.sh script 
see https://github.com/asciimoo/searx/pull/1479#issuecomment-569904632

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-29 14:36:47 +02:00
Markus Heiser 5f1cba5337 Revert "fix: Remove english shell dependency in manage.sh script" 
This reverts commit 7b9c8f777b.
 2020-04-29 14:33:47 +02:00
Markus Heiser 8829796f76 utils/morty.sh option new-key: set new morty key 
A command to set new morty key in morty & searx service (settings.yml) and to
restart both services with new key::

  utils/morty.sh option new-key

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-28 16:54:42 +02:00
Markus Heiser ea3255835a utils/morty.sh: set morty key to avoid service abuse 
- https://github.com/asciimoo/searx/issues/1871#issuecomment-592459798

    make install all

generates random MORTY_KEY, install service with that key and sets option in the
searx settingy.yml file.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-28 16:21:45 +02:00
Markus Heiser 26a3a7d523 [docs] installation: add note to update OS before install searx 
see: https://github.com/asciimoo/searx/pull/1803#issuecomment-618456661

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-28 14:44:28 +02:00
Markus Heiser 9504acaca6 Merge branch 'master' of https://github.com/asciimoo/searx into filtron 2020-04-23 12:49:56 +02:00
Markus Heiser 7342806987 Merge pull request #1936 from return42/fix-fetch 
[fix] ffox useragent: use Windows NT 10.0 and not Windows NT 10
 2020-04-23 08:04:07 +00:00
Markus Heiser 1fdd8cd3c0 Merge branch 'master' of https://github.com/asciimoo/searx into filtron 2020-04-22 14:24:59 +02:00
Markus Heiser d21e0b0ef8 [fix] old images need an initial 'apt update' 
see https://github.com/asciimoo/searx/pull/1803#issuecomment-616684353

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-22 01:11:25 +02:00
Markus Heiser 697dd6c6d3 [fix] ffox useragent: use Windows NT 10.0 and not Windows NT 10 
This is an addittion to PR #1934:

  The .0 change really counts on some engines like Bing which seems to allow
  Windows NT 10.0 but not Windows NT 10.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-22 00:43:42 +02:00
Markus Heiser ac2b0ffa03 Merge pull request #1934 from unixfox/patch-2 
Update default user agents
 2020-04-21 21:31:53 +00:00
Markus Heiser f18f94a857 Merge pull request #1923 from HLFH/master 
Remove discontinued faroo engine
 2020-04-20 12:51:28 +00:00
Markus Heiser 9302d1fc17 Merge branch 'master' into master 2020-04-20 12:44:50 +00:00
Markus Heiser 5fc17de861 docs: marginal fix of command's './utils/lxc.sh show suite' output 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-19 12:34:37 +02:00
Markus Heiser 4b4e95f2c3 Merge branch 'master' of https://github.com/asciimoo/searx into filtron 2020-04-19 12:03:14 +02:00
Markus Heiser f2ca12b54f Merge branch 'master' of https://github.com/asciimoo/searx into filtron 2020-04-13 13:01:07 +02:00
Markus Heiser 30c0a0fb64 doc: add missing command lines to nginx docs 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-13 13:00:03 +02:00
Markus Heiser 99ff16c465 tooling box: added nginx + polished bash scripts and environment 
- add installation method for nginx sites, morty and filtron
- clean up PUBLIC_URL environment in and outside of containers
- clean up comand lines
- handle uWSGI quirks on fedora (emperor mode)
- handle Python quirks on debian (there is no 'python' command anymore)
- lib.sh: add die and die_caller functions
- lxc_suite_install_info is now a function
- lint: shellcheck

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-13 11:34:28 +02:00
Markus Heiser 58d5da8b57 nginx: normalize installation (docs and script)s over all distros 
This is the revision of the documentation about the varous nginx installation
variants.  It also implements the nginx installation scripts for morty and
filtron.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-11 13:19:11 +02:00
Markus Heiser 67afa6b1fb bash scripts: source code cleaned up (shellcheck) 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-10 14:00:52 +02:00
Markus Heiser ebde9d10fd docs: proofreading of all the installation topics 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-09 15:04:23 +02:00
Markus Heiser 44edc92569 [fix] morty: PUBLIC_URL_PATH_MORTY needs trailing slash 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-09 14:28:34 +02:00
Markus Heiser f693149cde Changes from the installation tests on (all) LXC containers. 
Tested and fixed HTTP & uWSGI installation on:

  ubu1604 ubu1804 ubu1910 ubu2004 fedora31 archlinux

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-08 18:38:36 +02:00
Markus Heiser 5d4fcfcd9e Merge branch 'master' into requirements-upgrade 2020-04-08 14:55:49 +00:00
Markus Heiser 4e872c2b19 Merge pull request #1916 from dalf/travis-python-version 
[mod] .travis.yml: add Python 3.7 and Python 3.8
 2020-04-08 14:33:22 +00:00
Markus Heiser ee39a098ac apache: normalize installation (docs and script)s over all distros 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-07 18:31:51 +02:00
Markus Heiser eb0d4646d8 docs: rework of chapter "Install with apache" 
BTW: normalize installation-nginx.rst
 2020-04-06 17:59:06 +02:00
Markus Heiser c81849cb5a filtron.sh & morty.sh: improve usage message (if used in containers) 
BTW: normalize soma variable names

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-05 17:40:37 +02:00
Markus Heiser c2caf9569c [fix] creation of /.lxcenv in containers 
In utils/lib.sh there are two functions with the same name, but different tasks.
Rename one of them from lxc_init_container() into lxc_init_container_env().

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-05 15:15:28 +02:00
Markus Heiser c748047e92 utils/searx.sh: add cmd to (un)set option image_proxy and result_proxy 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-04 17:54:20 +02:00
Markus Heiser e530e20ae6 misc: fix variuous marginals 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-04 17:53:16 +02:00
Markus Heiser 3c19f2f1ce utils/lxc.sh install: support installation on selected containers 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-04 12:40:14 +02:00
Markus Heiser 84daf9999c docs: remove PR #1803 hints 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-04 08:36:48 +02:00
Markus Heiser e32b08f616 utils/morty.sh: add generic documentation 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-03 20:26:20 +02:00
Markus Heiser 853be4e11c utils/filtron.sh: add generic documentation 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-03 20:24:40 +02:00
Markus Heiser af988dbf71 utils/lxc.sh: support build of selected containers 
$ sudo -H ./utils/lxc.sh build  <name>
  $ sudo -H ./utils/lxc.sh show   [images|suite|info|config [<name>]]

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-03 17:08:42 +02:00
Markus Heiser f32b4fcedd LXC: add virtualenv to LXC_BASE_PACKAGES 
Commit 09a40625 adds virtualenv dependency.  BTW remove deprecated
--no-site-packages.  Not having access to global site-packages is now the
default behavior.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-02 20:27:44 +02:00
Markus Heiser 2441e24288 Merge branch 'master' of https://github.com/asciimoo/searx into filtron 2020-04-02 18:59:43 +02:00
Markus Heiser 65e8af62b1 Merge pull request #1910 from return42/rfc-travis 
improve travis build
 2020-04-02 16:24:17 +00:00
Markus Heiser 70d114fab5 Merge branch 'master' into rfc-travis 2020-04-02 16:16:18 +00:00
Markus Heiser 41f002b0ea travis: remove before_cache handle 
BTW: separate env output in the travis log

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-02 18:00:53 +02:00
Markus Heiser 07932951f2 Merge pull request #1911 from dalf/docker-tag-fix 
[fix] travis: fix docker tag.
 2020-04-02 13:20:40 +00:00
Markus Heiser fc89c698bd make test.pylint: do not run pylint checks in py2 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-01 19:20:52 +02:00
Markus Heiser 09a4062505 makefile.python: partial revert off 9b48ae47, adds py2 support back 
revert "makefile.python: ... drop build support py2" to get back Py2 support.
TPy2 support need virtualenv installed by the OS.

BTW: log environment and python version in travis's install phase

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-01 17:21:26 +02:00
Markus Heiser 31437d04e8 makefile.python: hardening - start pylint by module 
- replace: $(PY_ENV_BIN)/pylint --> $(PY_ENV_BIN)/python -m pylint

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-01 16:07:59 +02:00
Markus Heiser 565493b57d travis: use Makefile target travis.codecov to install codecov 
fix travis build error [1]::

  The command "local/py3/bin/pip install codecov" failed and exited with 127

Use the correct pip (python environment) from build environment::

  $(PY_ENV_BIN)/python -m pip

[1] https://travis-ci.org/github/asciimoo/searx/jobs/669701405#L590

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-01 15:45:01 +02:00
Markus Heiser e340bb5bd1 travis: remove platform option arm64 
[1] https://github.com/asciimoo/searx/pull/1910#issuecomment-607244871

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-01 15:27:01 +02:00
Markus Heiser adc3a855e6 Revert "travis: disable cache" 
This reverts commit eb87b07d51.
 2020-04-01 15:22:24 +02:00
Markus Heiser eb87b07d51 travis: disable cache 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-01 15:06:48 +02:00
Markus Heiser 9e32fb27e7 [fix] travis: Permission denied: '/home/travis/.cache/pip/...' 
Fix "Permission denied: '/home/travis/.cache/" errors from travis build [1].

Change owner https://docs.travis-ci.com/user/caching/#caches-and-read-permissions
and remove old log in the *before_caching* phase:

  https://docs.travis-ci.com/user/caching/#before_cache-phase

About pip cache see: https://docs.travis-ci.com/user/caching/#pip-cache

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>

[1] https://travis-ci.org/github/asciimoo/searx/jobs/669664131#L220
 2020-04-01 14:49:10 +02:00
Markus Heiser 9b48ae47ec makefile.python: hardening - drop virtualenv, drop build support py2 
From py3.3 on a subset of virtualenv is built-in, so you can run '-m venv' ot of
the box.

- replace: $(PY_ENV_BIN)/pip --> $(PY_ENV_BIN)/python -m pip
- remove obsolete virtualenv-exe target and adjust VTENV_OPTS
- remove obsolete msg-pip-exe target
- print list of py launchers available from $(PY_ENV_BIN) to the log
- fix hard coded ./local

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-01 14:16:49 +02:00
Markus Heiser 8c145ff2fe travis: build on os: linux, dist: bionic, use platform arch: arm64 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-01 13:25:47 +02:00
Markus Heiser b18880985c travis: make travis build more verbose 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-01 13:13:49 +02:00
Markus Heiser 0a951d0e55 [fix] travis: Permission denied: '/home/travis/.cache/pip/...' 
Change owner https://docs.travis-ci.com/user/caching/#caches-and-read-permissions
and remove old log in the *before_caching* phase:

  https://docs.travis-ci.com/user/caching/#before_cache-phase

About pip cache see: https://docs.travis-ci.com/user/caching/#pip-cache

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-01 12:44:32 +02:00
Markus Heiser a62e3c9358 travis: build on os: linux, dist: bionic, use platform arch: arm64 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-01 12:22:08 +02:00
Markus Heiser 3bbcfe6ab3 travis: make travis build more verbose 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-01 11:57:48 +02:00
Markus Heiser d599bdff0d travis: make travis build more verbose 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-01 11:15:34 +02:00
Markus Heiser 6007bd7fc8 makefile.python: fix (old) typo 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-01 10:59:51 +02:00
Markus Heiser 916d8a9e46 Merge branch 'master' of https://github.com/asciimoo/searx into filtron 2020-04-01 08:55:51 +02:00