summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-12-31Simply Nginx example by using alias directive for subdirectory URLRobin Schneider
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-31Fix Nginx subdir URL install docs which allowed download of settings.ymlRobin Schneider
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-30Merge pull request #1661 from 0xhtml/fix-engine-spotifyMarkus Heiser
Fix engine spotify As you can read here https://developer.spotify.com/documentation/web-api/#authentication all requests to the spotify api require authentication. You can not test the api without credentials.
2019-12-29Merge branch 'master' into fix-engine-spotifyMarkus Heiser
2019-12-28Merge pull request #1776 from return42/makefile-docMarkus Heiser
doc: describe Makefile targets & add reST primer
2019-12-28docs(css): render HTML rst-example slightly more discreetMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-28docs(admin): add article 'Buildhosts' with system requirementsMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-28docs(dev): add more markups to reST primerMarkus Heiser
- Literal blocks - Unicode substitution - Horizontal list - Math equations Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-26doc(dev): reST/sphinx add tabbed views extension (sphinx_tabs.tabs)Markus Heiser
See issue #1785: idea: in the doc, provide installation instructions with one tab per distrubution preview (don't bookmark): https://return42.github.io/searx/dev/reST.html#tabbed-views Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-25docs(dev): add refs to to gitmoji and Semantic PR in contrib sectionMarkus Heiser
preview (don't bookmark): https://return42.github.io/searx/dev/contribution_guide.html#code Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-24doc(dev): add remarks about creating good commits (messages)Markus Heiser
preview (don't bookmark): https://return42.github.io/searx/dev/contribution_guide.html#code Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-24Merge branch 'master' of https://github.com/asciimoo/searx into makefile-docMarkus Heiser
2019-12-24Merge pull request #1701 from CaffeinatedTech/patch-1Markus Heiser
Update README.rst for the future: please select meaningful commit messages. Here is a good summarize how a useful commit messages looks like: https://www.conventionalcommits.org/en/v1.0.0-beta.2/#summary Further read: https://wiki.openstack.org/wiki/GitCommitMessages#Information_in_commit_messages
2019-12-24Merge branch 'master' into patch-1Markus Heiser
2019-12-24Merge pull request #1615 from Nachtalb/ne/fix-infinite_scroll-with-vim_bindingsMarkus Heiser
Fix not jumping to results loaded by infinite scroll
2019-12-24Merge branch 'master' into ne/fix-infinite_scroll-with-vim_bindingsMarkus Heiser
2019-12-24Merge pull request #1694 from finn0/libgenMarkus Heiser
Fix broken Library Gensis Engine
2019-12-24Merge branch 'master' into libgenMarkus Heiser
2019-12-24Merge branch 'master' into makefile-docMarkus Heiser
2019-12-24Merge pull request #1787 from finn0/fix/infoboxMarkus Heiser
[Fix] oscar: no HTML escaping prior to output
2019-12-24[Fix] oscar: no HTML escaping prior to outputVipul
When results are fetched from any programming related documentation site (like git-scm.com, docs.python.org etc), content in Info box is shown as raw HTML code. This change addresses the issue by using "safe" filter feature provided by Django. See, - https://docs.djangoproject.com/en/3.0/ref/templates/builtins/#safe - Searx issue tracker (issue #1649), for more information. Resolves: #1649
2019-12-23Merge branch 'master' into makefile-docMarkus Heiser
2019-12-23Merge pull request #1686 from MarcAbonce/wiki_infobox_fixesMarkus Heiser
Infobox fixes
2019-12-23doc: reST-primer -- imrpove desription of definition listsMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-22makefile.sphinx: fix gh-pages / pull before add commitsMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-22doc: add plugin section to admin section (template)Markus Heiser
- Plugins configured at built time (defaults) Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-22Switch to https for some domainsVipul
2019-12-22doc: CSS - fix alignment of code block in figure blocksMarkus Heiser
BTW: minor profread of reST.rst Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-22doc: add 'Architecture' article to admin sectionMarkus Heiser
Herein we add some hints and suggestions about typical architectures of searx infrastructures. We start with a contribution from @dalf - https://github.com/asciimoo/searx/pull/1776#issuecomment-567917320 thanks @dalf !! Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-22[Fix] Libgen engineVipul
Libgen has switched to new domain (i.e https://libgen.is) with TLS support and older domain (i.e. http://libgen.io) is no longer accessible. See, https://en.wikipedia.org/wiki/Library_Genesis, for more information. Resolves: #1693
2019-12-22doc: improved HTML table layout (CSS)Markus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-22Merge branch 'master' of https://github.com/asciimoo/searx into makefile-docMarkus Heiser
2019-12-21hide suggestions box if emptyMarc Abonce Seguin
This bug happens only in python3 because map returns an iterator.
2019-12-21remove empty parenthesis in wikipedia's summaryMarc Abonce Seguin
They're usually IPA pronunciations which are removed by the API.
2019-12-21exclude disambiguation pages from wikipedia infoboxMarc Abonce Seguin
2019-12-21[enh] display error message if gigablast extra param expiredAdam Tauber
2019-12-21[mod] remove useless engine unit testsAdam Tauber
These tests are not able to detect engine errors if the upstream site changes.
2019-12-21[fix] pep8Adam Tauber
2019-12-21[fix] handle empty response from wikipedia engine - closes #1114Adam Tauber
2019-12-21[fix] convert byte query to string in osm engine - fixes #1220Adam Tauber
2019-12-21[fix] fetch extra search param of gigablast - fixes #1293Adam Tauber
2019-12-21[fix] add explicit useragent header to requests - closes #1459Adam Tauber
2019-12-21doc: add reST templating // incl. generic engine tabeMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-20docs: reST-primer describe table markup (WIP)Markus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-20docs: reST-primer continued proofreading (WIP)Markus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-20docs: reST-primer first proofreading (WIP)Markus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-20doc: reST primer -- describe admonitions & customize their CSSMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-19doc: add content to reST primer (WIP) // linuxdocMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-19doc: add reST primer (inital / WIP)Markus Heiser
preview: https://return42.github.io/searx/dev/reST.html includes: - :class: rst-example // admonitions with (rendered) reST markup example - extlinks to docutils Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2019-12-18edoc: -- makefile.rst fix typo and add extlinks['man']Markus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>