ZaclysIndustries/searxngRebrandZaclys
2
0
Fork 0
forked from zaclys/searxng
Code Issues Pull Requests Activity
3,306 Commits 3 Branches 17 Tags 53 MiB
ec48447361
Commit Graph

3306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Heiser
99ff16c465 tooling box: added nginx + polished bash scripts and environment 
- add installation method for nginx sites, morty and filtron
- clean up PUBLIC_URL environment in and outside of containers
- clean up comand lines
- handle uWSGI quirks on fedora (emperor mode)
- handle Python quirks on debian (there is no 'python' command anymore)
- lib.sh: add die and die_caller functions
- lxc_suite_install_info is now a function
- lint: shellcheck

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-13 11:34:28 +02:00
Alexandre Flament
fbf63f72c7
Merge branch 'master' into requirements-upgrade 2020-04-13 10:34:50 +02:00
Noémi Ványi
ee856571c9
Merge pull request #1914 from splintah/wikimedia-projects 
[add] Additional Wikimedia projects
 2020-04-12 22:54:07 +02:00
Noémi Ványi
7878176bb0
Merge branch 'master' into wikimedia-projects 2020-04-12 21:35:37 +02:00
Noémi Ványi
527b1580b7
Merge pull request #1913 from Venca24/devel_rubygems 
[add] rubygems engine
 2020-04-12 19:26:09 +02:00
Noémi Ványi
f172aad5d2
Merge branch 'master' into devel_rubygems 2020-04-12 19:17:21 +02:00
Markus Heiser
58d5da8b57 nginx: normalize installation (docs and script)s over all distros 
This is the revision of the documentation about the varous nginx installation
variants.  It also implements the nginx installation scripts for morty and
filtron.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-11 13:19:11 +02:00
Markus Heiser
67afa6b1fb bash scripts: source code cleaned up (shellcheck) 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-10 14:00:52 +02:00
Markus Heiser
ebde9d10fd docs: proofreading of all the installation topics 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-09 15:04:23 +02:00
Markus Heiser
44edc92569 [fix] morty: PUBLIC_URL_PATH_MORTY needs trailing slash 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-09 14:28:34 +02:00
Markus Heiser
f693149cde Changes from the installation tests on (all) LXC containers. 
Tested and fixed HTTP & uWSGI installation on:

  ubu1604 ubu1804 ubu1910 ubu2004 fedora31 archlinux

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-08 18:38:36 +02:00
Markus Heiser
5d4fcfcd9e
Merge branch 'master' into requirements-upgrade 2020-04-08 14:55:49 +00:00
Markus Heiser
4e872c2b19
Merge pull request #1916 from dalf/travis-python-version 
[mod] .travis.yml: add Python 3.7 and Python 3.8
 2020-04-08 14:33:22 +00:00
Dalf
3973951770 [mod] requirements.txt: upgrade dependency versions. 2020-04-08 15:58:26 +02:00
Dalf
a7862ba3c1 [mod] .travis.yml: add Python 3.7 and Python 3.8 2020-04-08 15:42:02 +02:00
Markus Heiser
ee39a098ac apache: normalize installation (docs and script)s over all distros 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-07 18:31:51 +02:00
Splinter Suidman
83fa88cbec
fix: Change Wikiversity and Wikivoyage shortcuts to wv and wy. 
Suggested by @Venca24 <https://github.com/asciimoo/searx/pull/1914#issuecomment-610194209>.
 2020-04-07 11:05:35 +02:00
Markus Heiser
eb0d4646d8 docs: rework of chapter "Install with apache" 
BTW: normalize installation-nginx.rst
 2020-04-06 17:59:06 +02:00
Splinter Suidman
87fba9c12d
fix: Remove unnecessary query parameter for Wikimedia projects. 2020-04-06 15:59:00 +02:00
Splinter Suidman
c37544e6be
fix: Spelling of Wiktionary. 2020-04-06 12:31:32 +02:00
Splinter Suidman
2b453cb226
fix: Change Wikinews category to news. 2020-04-06 12:31:00 +02:00
Splinter Suidman
536eb2b8dd
Add Wikimedia projects. 
A list of the added projects:
- Wikibooks
- Wikinews
- Wikiquote
- Wikisource
- Wiktionary
- Wikiversity
- Wikivoyage
 2020-04-05 19:27:44 +02:00
Markus Heiser
c81849cb5a filtron.sh & morty.sh: improve usage message (if used in containers) 
BTW: normalize soma variable names

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-05 17:40:37 +02:00
Markus Heiser
c2caf9569c [fix] creation of /.lxcenv in containers 
In utils/lib.sh there are two functions with the same name, but different tasks.
Rename one of them from lxc_init_container() into lxc_init_container_env().

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-05 15:15:28 +02:00
Markus Heiser
c748047e92 utils/searx.sh: add cmd to (un)set option image_proxy and result_proxy 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-04 17:54:20 +02:00
Markus Heiser
e530e20ae6 misc: fix variuous marginals 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-04 17:53:16 +02:00
Markus Heiser
3c19f2f1ce utils/lxc.sh install: support installation on selected containers 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-04 12:40:14 +02:00
Markus Heiser
84daf9999c docs: remove PR #1803 hints 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-04 08:36:48 +02:00
Markus Heiser
e32b08f616 utils/morty.sh: add generic documentation 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-03 20:26:20 +02:00
Markus Heiser
853be4e11c utils/filtron.sh: add generic documentation 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-03 20:24:40 +02:00
Venca24
5cb9d9e56a [add] rubygems engine 2020-04-03 17:31:59 +02:00
Markus Heiser
af988dbf71 utils/lxc.sh: support build of selected containers 
$ sudo -H ./utils/lxc.sh build  <name>
  $ sudo -H ./utils/lxc.sh show   [images|suite|info|config [<name>]]

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-03 17:08:42 +02:00
Markus Heiser
f32b4fcedd LXC: add virtualenv to LXC_BASE_PACKAGES 
Commit 09a40625 adds virtualenv dependency.  BTW remove deprecated
--no-site-packages.  Not having access to global site-packages is now the
default behavior.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-02 20:27:44 +02:00
Markus Heiser
2441e24288 Merge branch 'master' of https://github.com/asciimoo/searx into filtron 2020-04-02 18:59:43 +02:00
Markus Heiser
65e8af62b1
Merge pull request #1910 from return42/rfc-travis 
improve travis build
 2020-04-02 16:24:17 +00:00
Markus Heiser
70d114fab5
Merge branch 'master' into rfc-travis 2020-04-02 16:16:18 +00:00
Markus Heiser
41f002b0ea travis: remove before_cache handle 
BTW: separate env output in the travis log

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-02 18:00:53 +02:00
Markus Heiser
07932951f2
Merge pull request #1911 from dalf/docker-tag-fix 
[fix] travis: fix docker tag.
 2020-04-02 13:20:40 +00:00
Dalf
4dad366146 [fix] travis: fix docker tag. 
the "-dirty" ignores the searx/brand.py and utils/brand.env files.
 2020-04-02 15:06:10 +02:00
Markus Heiser
fc89c698bd make test.pylint: do not run pylint checks in py2 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-01 19:20:52 +02:00
Markus Heiser
09a4062505 makefile.python: partial revert off 9b48ae47, adds py2 support back 
revert "makefile.python: ... drop build support py2" to get back Py2 support.
TPy2 support need virtualenv installed by the OS.

BTW: log environment and python version in travis's install phase

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-01 17:21:26 +02:00
Markus Heiser
31437d04e8 makefile.python: hardening - start pylint by module 
- replace: $(PY_ENV_BIN)/pylint --> $(PY_ENV_BIN)/python -m pylint

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-01 16:07:59 +02:00
Markus Heiser
565493b57d travis: use Makefile target travis.codecov to install codecov 
fix travis build error [1]::

  The command "local/py3/bin/pip install codecov" failed and exited with 127

Use the correct pip (python environment) from build environment::

  $(PY_ENV_BIN)/python -m pip

[1] https://travis-ci.org/github/asciimoo/searx/jobs/669701405#L590

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-01 15:45:01 +02:00
Markus Heiser
e340bb5bd1 travis: remove platform option arm64 
[1] https://github.com/asciimoo/searx/pull/1910#issuecomment-607244871

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-01 15:27:01 +02:00
Markus Heiser
adc3a855e6 Revert "travis: disable cache" 
This reverts commit eb87b07d51.
 2020-04-01 15:22:24 +02:00
Markus Heiser
eb87b07d51 travis: disable cache 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-01 15:06:48 +02:00
Markus Heiser
9e32fb27e7 [fix] travis: Permission denied: '/home/travis/.cache/pip/...' 
Fix "Permission denied: '/home/travis/.cache/" errors from travis build [1].

Change owner https://docs.travis-ci.com/user/caching/#caches-and-read-permissions
and remove old log in the *before_caching* phase:

  https://docs.travis-ci.com/user/caching/#before_cache-phase

About pip cache see: https://docs.travis-ci.com/user/caching/#pip-cache

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>

[1] https://travis-ci.org/github/asciimoo/searx/jobs/669664131#L220
 2020-04-01 14:49:10 +02:00
Markus Heiser
9b48ae47ec makefile.python: hardening - drop virtualenv, drop build support py2 
From py3.3 on a subset of virtualenv is built-in, so you can run '-m venv' ot of
the box.

- replace: $(PY_ENV_BIN)/pip --> $(PY_ENV_BIN)/python -m pip
- remove obsolete virtualenv-exe target and adjust VTENV_OPTS
- remove obsolete msg-pip-exe target
- print list of py launchers available from $(PY_ENV_BIN) to the log
- fix hard coded ./local

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-01 14:16:49 +02:00
Markus Heiser
8c145ff2fe travis: build on os: linux, dist: bionic, use platform arch: arm64 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-01 13:25:47 +02:00
Markus Heiser
b18880985c travis: make travis build more verbose 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-01 13:13:49 +02:00