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
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
Adam Tauber
6060ab85f8
[enh] version v0.16.0
2020-01-30 13:39:06 +01:00
Adam Tauber
89662cd33e
[enh] update AUTHORS.rst with new contributors
2020-01-30 13:33:19 +01:00
Adam Tauber
b6a2aff94a
[enh] update translations
2020-01-30 11:16:15 +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
Adam Tauber
8e3bd3fcbd
[mod] add py2 deprecation warning to webapp
2020-01-28 15:52: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