Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							d471ec86dd 
							
						 
					 
					
						
						
							
							Makefile: add target node.env  - download & install npm dependencies  
						
						... 
						
						
						
						Signed-off-by: Markus Heiser <markus.heiser@darmarit.de> 
						
						
					 
					
						2020-03-25 16:38:52 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							757ebb5d9f 
							
						 
					 
					
						
						
							
							[fix] brands: add variables from build env to grunt process  
						
						... 
						
						
						
						We have some variables in the build environment which are also needed in the
grunt process when building themes.  Theses variables are relavant if one
creates a fork with its own branding.  We treat these variables under the term
'brands'.
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de> 
						
						
					 
					
						2020-03-25 14:09:47 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							e84fc94300 
							
						 
					 
					
						
						
							
							[fix] brands: add variables from build env to sphinx-doc  
						
						... 
						
						
						
						We have some variables in the build environment which are also needed in the
sphinx-process.  Theses variables are relavant if one creates a fork with
its own branding.  We treat these variables under the term 'brands'.
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de> 
						
						
					 
					
						2020-03-25 11:51:03 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							2d956696e9 
							
						 
					 
					
						
						
							
							docs: building (PDF) books / build user book  
						
						... 
						
						
						
						BTW: cleaned up Makefile target help
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de> 
						
						
					 
					
						2020-03-21 18:45:38 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							80f7b65804 
							
						 
					 
					
						
						
							
							searx.sh: add buildhost cmd, installs OS packages for builds  
						
						... 
						
						
						
						Signed-off-by: Markus Heiser <markus.heiser@darmarit.de> 
						
						
					 
					
						2020-03-09 01:37:26 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							04ad648105 
							
						 
					 
					
						
						
							
							makefile.python: remove python2 support  
						
						... 
						
						
						
						Signed-off-by: Markus Heiser <markus.heiser@darmarit.de> 
						
						
					 
					
						2020-03-08 18:35:38 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							a258358633 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/asciimoo/searx  into filtron  
						
						
						
						
					 
					
						2020-03-07 09:03:24 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							c15337850e 
							
						 
					 
					
						
						
							
							fix: minor typos  
						
						... 
						
						
						
						Signed-off-by: Markus Heiser <markus.heiser@darmarit.de> 
						
						
					 
					
						2020-03-06 22:06:19 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							857a1458b1 
							
						 
					 
					
						
						
							
							docs: for example URLs use iana's example.org  
						
						... 
						
						
						
						Signed-off-by: Markus Heiser <markus.heiser@darmarit.de> 
						
						
					 
					
						2020-03-06 15:04:12 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							387c6a7769 
							
						 
					 
					
						
						
							
							docs: improve description of uwsgi & ngingx setup  
						
						... 
						
						
						
						Signed-off-by: Markus Heiser <markus.heiser@darmarit.de> 
						
						
					 
					
						2020-03-06 14:47:00 +01:00 
						 
				 
			
				
					
						
							
							
								Noémi Ványi 
							
						 
					 
					
						
						
						
						
							
						
						
							3d03fb3050 
							
						 
					 
					
						
						
							
							Add new post to blog about private engines  
						
						
						
						
					 
					
						2020-03-05 22:21:20 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							cbc08fdc26 
							
						 
					 
					
						
						
							
							docs: describe uwsgi setup of all suported distributions  
						
						... 
						
						
						
						Signed-off-by: Markus Heiser <markus.heiser@darmarit.de> 
						
						
					 
					
						2020-03-04 19:56:40 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							3aff2c19d1 
							
						 
					 
					
						
						
							
							docs: complement uwsgi documentation for all distros  
						
						... 
						
						
						
						Signed-off-by: Markus Heiser <markus.heiser@darmarit.de> 
						
						
					 
					
						2020-03-04 12:22:20 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							3cb7daedb7 
							
						 
					 
					
						
						
							
							docs: generic doocumentation for searx-uwsgi  
						
						... 
						
						
						
						Signed-off-by: Markus Heiser <markus.heiser@darmarit.de> 
						
						
					 
					
						2020-03-03 19:57:15 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							f25da6070e 
							
						 
					 
					
						
						
							
							docs: generic documentation get templating  
						
						... 
						
						
						
						Signed-off-by: Markus Heiser <markus.heiser@darmarit.de> 
						
						
					 
					
						2020-03-03 16:26:02 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							c3e4753ce9 
							
						 
					 
					
						
						
							
							docs: generic documentation from the installation scripts  
						
						... 
						
						
						
						Signed-off-by: Markus Heiser <markus.heiser@darmarit.de> 
						
						
					 
					
						2020-03-02 19:00:19 +01: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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Dalf 
							
						 
					 
					
						
						
						
						
							
						
						
							88f9ac58f4 
							
						 
					 
					
						
						
							
							[mod] move public instance list to  https://searx.space  
						
						
						
						
					 
					
						2020-02-14 13:48:44 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							ed4cb4f160 
							
						 
					 
					
						
						
							
							tooling box: varius fix from tests  
						
						
						
						
					 
					
						2020-02-08 13:24:08 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							58a9fa93f6 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/asciimoo/searx  into filtron  
						
						
						
						
					 
					
						2020-01-13 18:40:09 +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 
						 
				 
			
				
					
						
							
							
								Emilien Devos 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e84067816b 
							
						 
					 
					
						
						
							
							searx.be stopped using Fathom analytics  
						
						
						
						
					 
					
						2020-01-12 10:48:29 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							51b9295b84 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/asciimoo/searx  into add-docs  
						
						
						
						
					 
					
						2020-01-03 14:30:53 +01:00 
						 
				 
			
				
					
						
							
							
								Robin Schneider 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3e5a3ee4e4 
							
						 
					 
					
						
						
							
							Let Nginx deliver static files directory in all examples  
						
						
						
						
					 
					
						2019-12-31 14:43:14 +01:00 
						 
				 
			
				
					
						
							
							
								Robin Schneider 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Robin Schneider 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							f9be534b2a 
							
						 
					 
					
						
						
							
							docs(dev): fix minor markup typos  
						
						... 
						
						
						
						Signed-off-by: Markus Heiser <markus.heiser@darmarit.de> 
						
						
					 
					
						2019-12-30 21:55:15 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							10997a01e0 
							
						 
					 
					
						
						
							
							docs(admin): add weight & disabled cols to engine table  
						
						... 
						
						
						
						BTW: remove internal suspend_end_time
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de> 
						
						
					 
					
						2019-12-30 20:29:37 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							b91e07bbf1 
							
						 
					 
					
						
						
							
							docs(css): render HTML rst-example slightly more discreet  
						
						... 
						
						
						
						Signed-off-by: Markus Heiser <markus.heiser@darmarit.de> 
						
						
					 
					
						2019-12-28 01:26:24 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							d1892b2112 
							
						 
					 
					
						
						
							
							docs(admin): add article 'Buildhosts' with system requirements  
						
						... 
						
						
						
						Signed-off-by: Markus Heiser <markus.heiser@darmarit.de> 
						
						
					 
					
						2019-12-28 01:25:16 +01:00 
						 
				 
			
				
					
						
							
							
								Markus Heiser 
							
						 
					 
					
						
						
						
						
							
						
						
							d6f2802e4b 
							
						 
					 
					
						
						
							
							docs(dev): add more markups to reST primer  
						
						... 
						
						
						
						- Literal blocks
- Unicode substitution
- Horizontal list
- Math equations
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de> 
						
						
					 
					
						2019-12-28 01:01:11 +01:00