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
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
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
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
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
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
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
eb0d4646d8
docs: rework of chapter "Install with apache"
...
BTW: normalize installation-nginx.rst
2020-04-06 17:59:06 +02:00
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
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
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
e530e20ae6
misc: fix variuous marginals
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-04 17:53:16 +02:00
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
84daf9999c
docs: remove PR #1803 hints
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-04 08:36:48 +02:00
e32b08f616
utils/morty.sh: add generic documentation
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-03 20:26:20 +02:00
853be4e11c
utils/filtron.sh: add generic documentation
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-03 20:24:40 +02:00
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
f32b4fcedd
LXC: add virtualenv to LXC_BASE_PACKAGES
...
Commit 09a40625
2020-04-02 20:27:44 +02:00
2441e24288
Merge branch 'master' of https://github.com/asciimoo/searx into filtron
2020-04-02 18:59:43 +02:00
65e8af62b1
Merge pull request #1910 from return42/rfc-travis
...
improve travis build
2020-04-02 16:24:17 +00:00
70d114fab5
Merge branch 'master' into rfc-travis
2020-04-02 16:16:18 +00:00
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
07932951f2
Merge pull request #1911 from dalf/docker-tag-fix
...
[fix] travis: fix docker tag.
2020-04-02 13:20:40 +00:00
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
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
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
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
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
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
adc3a855e6
Revert "travis: disable cache"
...
This reverts commit eb87b07d51
2020-04-01 15:22:24 +02:00
eb87b07d51
travis: disable cache
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-01 15:06:48 +02:00
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
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
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
b18880985c
travis: make travis build more verbose
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-01 13:13:49 +02:00
0a951d0e55
[fix] travis: Permission denied: '/home/travis/.cache/pip/...'
...
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>
2020-04-01 12:44:32 +02:00
a62e3c9358
travis: build on os: linux, dist: bionic, use platform arch: arm64
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-01 12:22:08 +02:00
3bbcfe6ab3
travis: make travis build more verbose
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-01 11:57:48 +02:00
d599bdff0d
travis: make travis build more verbose
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-01 11:15:34 +02:00
6007bd7fc8
makefile.python: fix (old) typo
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-04-01 10:59:51 +02:00
916d8a9e46
Merge branch 'master' of https://github.com/asciimoo/searx into filtron
2020-04-01 08:55:51 +02:00
8189e18d91
Merge pull request #1905 from dalf/docker-build-fix
...
[fix] travis: fix docker build.
2020-04-01 06:52:03 +00:00
2a1db2ac4a
Merge branch 'master' into docker-build-fix
2020-03-31 20:14:40 +02:00
81b9848eb9
Merge branch 'master' of https://github.com/asciimoo/searx into filtron
2020-03-31 18:29:00 +02:00
f27f6c6c5d
docs: use make and uitls/searx.sh in containers
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-31 18:25:40 +02:00
c97c4947d5
Merge pull request #1906 from dalf/pr-1900-typo-fix
...
[fix] template: fix typo in about.html
2020-03-31 15:50:35 +00:00
4bb35e7ef5
[fix] template: fix typo in about.html
2020-03-31 16:52:52 +02:00
d425e26e80
[fix] fix travis build
2020-03-31 11:59:54 +02:00
8634eeb9de
Merge branch 'master' of https://github.com/asciimoo/searx into filtron
2020-03-30 18:49:35 +02:00
dd53c45a2c
docs: add utils/lxc.sh docs, normalize filtron, morty & searx docs
...
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2020-03-30 18:47:01 +02:00
Markus Heiser
Dalf