Markus Heiser
491cb95a1f
utils/lxc.env: separate environment that is used in containers
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-03-01 18:28:10 +01:00
Markus Heiser
37c135f2ce
LXC: improved UX when working with a bunch of containers
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-02-27 19:13:03 +01:00
Markus Heiser
af6acd3417
LXC: install searx-suite installs searx, filtron & morty on all containers
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-02-26 19:07:55 +01:00
Markus Heiser
d5917cc029
utils/lib.sh: make uWSGI installation available for all distros
...
support: ubuntu, debin, fedora, archlinux
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-02-25 20:20:17 +01:00
Markus Heiser
f5d10abc7f
Merge branch 'master' of https://github.com/asciimoo/searx into filtron
2020-02-25 11:27:08 +01:00
Markus Heiser
6a3ef5561b
Merge pull request #1861 from return42/fix-prefs
...
fix serious bugs of the test procedure
2020-02-25 08:56:34 +01:00
Markus Heiser
8685d1b7d8
Merge branch 'master' into fix-prefs
2020-02-24 08:16:42 +01:00
Markus Heiser
700574357a
make test: bugfix, pyenvinstall is a prerequisite for the pylint test
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-02-24 08:14:09 +01:00
Markus Heiser
692c331b30
Merge pull request #1863 from MarcAbonce/monkey-patch-occitan-locale
...
Monkey patch babel get_translations to support Occitan
2020-02-24 08:08:16 +01:00
Markus Heiser
aa95a0d70b
searx/testing.py: fixed pep8 error
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-02-24 07:55:14 +01:00
Markus Heiser
81f106e5de
searx/testing.py: bugfix process model (do not use Flask's debug mode)
...
Don't enable Flask's debug mode, the debugger from Flask will cause a wired
process model, where the server never dies. Further read:
- debug mode: https://flask.palletsprojects.com/quickstart/#debug-mode
- Flask.run(..): https://flask.palletsprojects.com/api/#flask.Flask.run
closes: https://github.com/asciimoo/searx/issues/1862
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-02-23 23:03:05 +01:00
Markus Heiser
4a94b4cca6
searx/testing.py: pylint & SPDX tag (no functional change)
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-02-23 22:51:07 +01:00
Markus Heiser
3f3351639a
Merge branch 'master' of https://github.com/asciimoo/searx into filtron
2020-02-23 21:06:34 +01:00
Markus Heiser
f17b28743a
utils/serx.sh: make uWSGI installation available for all distros (WIP)
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-02-23 21:05:22 +01:00
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
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
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
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
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
Markus Heiser
a014fa0ccd
upload-pypi: twine is needed to upload to PyPi 'make upload-pypi'
...
To build & deploy packages on PyPi call make target:
make upload-pypi
- https://github.com/asciimoo/searx/issues/1829
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-02-05 15:26:57 +01:00
Markus Heiser
a99c65dd01
docs: misc marginal fixes
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-02-05 07:37:26 +01:00
Markus Heiser
71d7550dbe
tooling box ./utils/*: minor fix from production test
2020-02-04 19:47:33 +01:00
Markus Heiser
2f40f61f83
/etc/filtron/rules.json: normalize rules from docs & tooling box
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-02-04 17:59:58 +01:00
Markus Heiser
d07119ca49
docs(css): render ..content and ..toctree directive same
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-02-04 16:43:07 +01:00
Markus Heiser
eedd63ccd5
docs: revision of the installation instructions
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-02-04 16:42:13 +01:00
Markus Heiser
a5eefea61d
docs: fix extlink 'origin' to use GIT_BRANCH env
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-02-04 13:26:43 +01:00
Markus Heiser
9278f0fb45
docs: add some documentation about the tooling box ./utils/*
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-02-04 13:13:17 +01:00
Markus Heiser
8ca86f46d3
.config.sh: wrap up to use environment from Makefile as best defaults
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-02-04 10:43:48 +01:00
Markus Heiser
79e1f837ef
utils & Makefile: add .config.mk & .config.sh for searx brands
...
By isolating the environment of makefiles and bash scripts into .config.mk and
.config.sh it is simple to maintain searx brands by setting some central
environments.
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-02-04 10:39:42 +01:00
Markus Heiser
94ac560dcc
doc: add descriptions of our tooling box in ./utils
...
Initial started with the scripts for searx, filtron and morty installations.
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-02-03 13:25:51 +01:00
Markus Heiser
e7401796f6
utils/morty.sh: fixed public url
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-02-02 18:20:20 +01:00
Markus Heiser
a4437c47ac
utils/morty.sh: add script to install morty result proxy
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-02-02 18:14:10 +01:00
Markus Heiser
709ac51d33
utils/filtron.sh: generalize systemd, accounts and golang tasks
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-02-01 16:59:27 +01:00
Markus Heiser
56a93ee770
utils/lib.sh: colorize messages
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-01-31 18:24:31 +01:00
Markus Heiser
1e3d2f6800
Merge branch 'master' of https://github.com/asciimoo/searx into filtron
2020-01-31 17:27:52 +01:00
Markus Heiser
0bb8847087
utils/filtron.sh: add option to debug filtron requests
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-01-31 17:25:38 +01:00
Markus Heiser
91a55e159e
apache: reverse proxy, set ProxyPreserveHost On
...
related discussions:
- https://github.com/asciimoo/searx/issues/1822
- https://github.com/asciimoo/searx/issues/1819#issuecomment-580400259
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-01-31 15:54:07 +01:00
Markus Heiser
cd9b877c8c
utils/searx.sh & filtron.sh: misc changes from first tests (WIP)
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-01-31 15:53:53 +01:00
Markus Heiser
6274a54746
utils/searx.sh & filtron.sh: misc changes from first tests (WIP)
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-01-30 19:55:51 +01:00
Markus Heiser
924bf65517
utils/searx.sh & filtron.sh: misc changes from first tests (WIP)
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-01-29 20:00:50 +01:00
Markus Heiser
54675c7690
Merge pull request #1766 from dalf/fix-infinite-scroll
...
[mod] infinite scroll: XHR requests are sent with the header "Accept: text/html"
2020-01-28 11:04:02 +00:00
Markus Heiser
e64ff38217
Merge branch 'master' into fix-infinite-scroll
2020-01-28 10:59:03 +00:00
Markus Heiser
971a8264b2
utils/searx.sh: add apache site searx.conf:uwsgi (WIP)
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-01-27 19:08:40 +01:00
Markus Heiser
d171fcd56e
utils/searx.sh: add apache site searx.conf:uwsgi
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-01-21 18:38:57 +01:00
Markus Heiser
af2f58fc58
utils/filtron.sh: add script to install filtron middleware (apache)
...
Preparation for the installation of an apache site.
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-01-20 19:08:56 +01:00
Markus Heiser
9b5a7f7559
utils/searx.sh: add script to install isolated searx service
...
First version which serves searx over uwsgi at http://127.0.0.1:8888
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-01-20 16:55:05 +01:00
Markus Heiser
89df9d9141
utils/searx.sh: add script to install isolated searx service (WIP)
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-01-16 14:01:38 +01:00
Markus Heiser
3cf31528f3
utils/searx.sh: add script to install isolated searx service (WIP)
...
WIP: written from scratch / linted but untested
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-01-14 19:26:54 +01:00
Markus Heiser
58a9fa93f6
Merge branch 'master' of https://github.com/asciimoo/searx into filtron
2020-01-13 18:40:09 +01:00
Markus Heiser
c2b27d9120
Merge branch 'filtron' of https://github.com/return42/searx into filtron
2020-01-13 18:39:46 +01:00
Markus Heiser
b5449ec47c
filtron: log suspiciously frequent queries (WIP)
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-01-13 18:37:05 +01:00
Markus Heiser
fe64274fb0
docs: filtron.sh add remark about init systems
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-01-12 15:53:35 +01:00
Markus Heiser
3ed82a97af
utils/filtron.sh: add command 'update filtron'
...
BTW: tidy up some code style and fix some issues reported by the linter.
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-01-12 15:51:04 +01:00
Markus Heiser
bda1895655
Merge pull request #1804 from unixfox/patch-1
...
searx.be stopped using Fathom analytics
2020-01-12 11:25:47 +00:00
Markus Heiser
39feb141bc
docs(admin): add description of the utils/filtron.sh script
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-01-11 12:50:40 +01:00
Markus Heiser
876988a34f
docs: add Sphinx-doc extension sphinxcontrib.programoutput
...
- https://github.com/NextThought/sphinxcontrib-programoutput
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-01-11 12:49:02 +01:00
Markus Heiser
4990b07b4b
utils/filtron.sh: various fix from first installation test (WIP)
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-01-09 16:25:05 +01:00
Markus Heiser
f20193155a
Merge branch 'master' of https://github.com/asciimoo/searx into filtron
2020-01-08 19:22:24 +01:00
Markus Heiser
4139c63d23
utils/filtron.sh: add script to install filtron middleware
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-01-08 19:21:07 +01:00
Markus Heiser
28dacee288
utils: add lib.sh containing common shell script
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-01-08 18:13:22 +01:00
Markus Heiser
bdf392093a
build requirements: add a shell script static analysis tool
...
ShellCheck: https://github.com/koalaman/shellcheck
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-01-08 18:09:36 +01:00
Markus Heiser
22d05b3e59
Merge pull request #1791 from return42/add-docs
...
misc docs
2020-01-06 14:28:24 +00:00
Markus Heiser
86b5163641
docs: move wiki/Searx-instances from wiki to docs
...
fix project link in conf.py
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-01-06 15:06:36 +01:00
Markus Heiser
f521a279ac
Merge branch 'master' of https://github.com/asciimoo/searx into add-docs
2020-01-06 14:32:34 +01:00
Markus Heiser
0f4f0e517e
docs(user): move wiki/Searx-instances from wiki to docs
...
fixed some reST markups
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de >
2020-01-06 14:31:18 +01:00
Markus Heiser
a3bbf95ad5
Merge pull request #1781 from finn0/bug/oscar-theme
...
Oscar: move info box at top of the page
2020-01-06 08:16:22 +00:00