b6a2aff94a
[enh] update translations
2020-01-30 11:16:15 +01:00
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
8e3bd3fcbd
[mod] add py2 deprecation warning to webapp
2020-01-28 15:52:50 +01:00
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
e64ff38217
Merge branch 'master' into fix-infinite-scroll
2020-01-28 10:59:03 +00:00
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
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
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
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
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
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
24472ce718
Merge branch 'master' into docker/opencontainers
2020-01-14 15:43:43 +01:00
58a9fa93f6
Merge branch 'master' of https://github.com/asciimoo/searx into filtron
2020-01-13 18:40:09 +01:00
c2b27d9120
Merge branch 'filtron' of https://github.com/return42/searx into filtron
2020-01-13 18:39:46 +01:00
b5449ec47c
filtron: log suspiciously frequent queries (WIP)
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-01-13 18:37:05 +01:00
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
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
bda1895655
Merge pull request #1804 from unixfox/patch-1
...
searx.be stopped using Fathom analytics
2020-01-12 11:25:47 +00:00
e84067816b
searx.be stopped using Fathom analytics
2020-01-12 10:48:29 +00:00
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
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
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
f20193155a
Merge branch 'master' of https://github.com/asciimoo/searx into filtron
2020-01-08 19:22:24 +01:00
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
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
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
68abe6ff11
Merge pull request #1800 from Yetangitu/flickr_noapi_double_encode
...
[engines|fix] flickr_noapi: Fix double-encode error (fixes #1799 )
2020-01-08 00:42:17 +00:00
db9d7d47bd
Fix double-encode error ( fixes #1799 )
2020-01-07 21:41:43 +01:00
22d05b3e59
Merge pull request #1791 from return42/add-docs
...
misc docs
2020-01-06 14:28:24 +00:00
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
f521a279ac
Merge branch 'master' of https://github.com/asciimoo/searx into add-docs
2020-01-06 14:32:34 +01:00
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
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
1d86d0054f
Merge branch 'master' into bug/oscar-theme
2020-01-06 08:05:29 +00:00
3bb97fcb84
docs(user): public instances, fix Searxes@Danwin entry
...
fixes: https://github.com/asciimoo/searx/issues/1770
This is not Searx at all. This is Meta-Searx with other engines.
See https://github.com/asciimoo/searx/issues/1770#issuecomment-570776655
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-01-05 10:02:42 +01:00
200c3a31f5
docs(user): move wiki/Searx-instances from wiki to docs (WIP)
...
Move wiki entry https://github.com/asciimoo/searx/wiki/Searx-instances
into user section of the docs (#1785 ).
links has been ported from markdown to reST by::
regexpr: \[([^\]]*)\]\(([^)]*)\)
substitution: `\1 <\2>`__
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-01-04 18:26:04 +01:00
7347d9b508
docs(user): move wiki/Searx-instances from wiki to docs
...
Move wiki entry https://github.com/asciimoo/searx/wiki/Searx-instances
into user section of the docs (#1785 ).
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-01-04 17:09:11 +01:00
51b9295b84
Merge branch 'master' of https://github.com/asciimoo/searx into add-docs
2020-01-03 14:30:53 +01:00
17b6faa4c3
[fix] pep8
2020-01-02 22:38:12 +01:00
ad5bb994b1
[fix] add py3 compatibility
2020-01-02 22:30:18 +01:00
1e6253ce16
[fix] handle empty response
2020-01-02 22:29:55 +01:00
86a378bd01
[fix] handle missing thumbnail
2020-01-02 22:29:28 +01:00
2dc2e1e8f9
[fix] skip invalid encoded attributes
2020-01-02 22:29:10 +01:00
2292e6e130
[fix] handle missing result size
2020-01-02 22:28:47 +01:00
a1b85571a2
[fix] tmp suspend insecure engines
2020-01-02 22:28:18 +01:00
2a7855854b
Merge pull request #1623 from ypid/fix/nginx-subdir-hosting
...
Fix Nginx subdir URL install docs which allowed download of settings.yml
2019-12-31 16:26:21 +01:00
3e5a3ee4e4
Let Nginx deliver static files directory in all examples
2019-12-31 14:43:14 +01:00
088337295a
Simply Nginx example by using alias directive for subdirectory URL
...
We explicitly specific the static directory here using alias to allow to
host from a other subdirectory than "searx" which just so happens to
match the source code directory.
2019-12-31 14:41:27 +01:00
a1d9c81915
Fix Nginx subdir URL install docs which allowed download of settings.yml
...
Closes : #1617
There is an issue with the setup example in https://asciimoo.github.io/searx/dev/install/installation.html#installation for subdirectory URL deployments:
```nginx
root /usr/local/searx;
location = /searx { rewrite ^ /searx/; }
try_files $uri @searx;
}
location @searx {
uwsgi_param SCRIPT_NAME /searx;
include uwsgi_params;
uwsgi_modifier1 30;
uwsgi_pass unix:/run/uwsgi/app/searx/socket;
}
```
`try_files` causes Nginx to search for files in the server root first. If it matches a file, it is returned. Only if no file matched, the request is passed to uwsgi. The worst consequence I can think of is that `settings.yml` can be downloaded without authentication (where secrets and configuration details are stored).
To fix this, I propose:
```nginx
location = /searx {
rewrite ^ /searx/;
}
location /searx/static {
}
location /searx {
uwsgi_param SCRIPT_NAME /searx;
include uwsgi_params;
uwsgi_pass unix:/run/uwsgi/app/searx/socket;
}
```
And add
```
route-run = fixpathinfo:
```
to `/etc/uwsgi/apps-available/searx.ini` because `uwsgi_modifier1 30` is apparently deprecated. Ref: https://uwsgi-docs.readthedocs.io/en/latest/Changelog-2.0.11.html#fixpathinfo-routing-action
I assume this issue exists because some uwsgi upstream docs also use the `try_files` construct (at least I have seen this somewhere in the docs or somewhere else on the Internet but cannot find it right now again).
https://uwsgi-docs.readthedocs.io/en/latest/Nginx.html#hosting-multiple-apps-in-the-same-process-aka-managing-script-name-and-path-info also warns about this:
> If used incorrectly a configuration like this may cause security problems. For your sanity’s sake, double-triple-quadruple check that your application files, configuration files and any other sensitive files are outside of the root of the static files.
2019-12-31 14:24:27 +01:00
f602cb8e4d
docs(admin): moved settings description from wiki to docs
...
Move wiki entry https://github.com/asciimoo/searx/wiki/settings.yml
into admin section of the docs (#1785 ).
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-30 21:56:09 +01:00
Adam Tauber