kamp/searxng
1
0
Fork 0
mirror of https://github.com/searxng/searxng.git synced 2024-11-14 16:50:11 +01:00
Code
3,716 Commits 6 Branches 17 Tags 132 MiB
d41cafd5f3
Commit Graph

59 Commits

Author SHA1 Message Date
Markus Heiser
a70b9b9f61 [doc] recommend to use 'use_default_settings=True' 
Since #2291 is merged, it is recommend to use::

  use_default_settings=True

1. Add a template file use_default_settings.yml::

    SEARX_SETTINGS_TEMPLATE="${REPO_ROOT}/utils/templates/etc/searx/use_default_settings.yml"

2. In Chapter "Configuration" recommend to make use of
   'use_default_settings=True' and describe it

3. Rewrite of docs/admin/settings.rst
   - move chapter 'settings.yml location' to the top
   - update and split chapter 'Global Settings'

4. Add environment SEARX_SETTINGS_TEMPLATE to .config.sh

5. Use environment $SEARX_SETTINGS_TEMPLATE in the utils/searx.sh script

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-12-08 20:19:10 +01:00
Markus Heiser
69a61ce333 [fix] remove doc-build for centos-7 from './utils/searx.sh doc' 
Since there is no centos-7 documentation 'searx.sh doc' produce an error
message::

    ERROR: centos-: uWSGI not yet implemented

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-09-20 11:11:14 +02:00
Eliesemoule
1986b5ecac
Utility scripts adapted to run on CentOS 7 (#2112) 2020-08-01 22:12:44 +02:00
Markus Heiser
18805ee352 [fix] markup of auto generated installation instruction (uWSGI part) 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-06-24 15:15:15 +02:00
Markus Heiser
51428de0fe [fix] add missing latexmk package to debian's BUILD_PACKAGES 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-06-18 18:35:59 +02:00
Markus Heiser
f576cadfba [fix] installation instructions: pip install -e searx (setup.py) 
In the past we did not really install searx into the virtualenv.  This is a
problem, since entry-points and other python installation stuff is not trigger.

See discussion: https://github.com/asciimoo/searx/pull/1938#issuecomment-632056508

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-05-21 15:46:43 +02:00
Markus Heiser
0973255aff [fix] fatal: repository '/root/searx' does not exist 
The $SERVICE_USER (searx) needs read permission to clone repository.  The
installation script stops if permission is not granted.

- https://github.com/asciimoo/searx/pull/1803#issuecomment-616406528

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-30 17:49:26 +02:00
Markus Heiser
ea3255835a utils/morty.sh: set morty key to avoid service abuse 
- https://github.com/asciimoo/searx/issues/1871#issuecomment-592459798

    make install all

generates random MORTY_KEY, install service with that key and sets option in the
searx settingy.yml file.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-28 16:21:45 +02:00
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
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
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
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
Markus Heiser
eb0d4646d8 docs: rework of chapter "Install with apache" 
BTW: normalize installation-nginx.rst
 2020-04-06 17:59:06 +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
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
853be4e11c utils/filtron.sh: add generic documentation 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-04-03 20:24:40 +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
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
Markus Heiser
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
7b4cf2eb48 tooling box: simplify build enviroments 
- no more need for a .config.mk
- docs: use searx.brands environment
- searx.sh, filtron.sh & morty.sh are sourcing utils/brand.env

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-29 15:09:34 +02: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
938bb02550 searx.sh: add commandline 'install packages' 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-08 18:32:30 +01:00
Markus Heiser
e7f69b63f1 LXC: from searx.sh, morty.sh and filtron.sh tests 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-08 02:41:45 +01:00
Markus Heiser
b1e90cff23 LXC: separate lxc-suite from lxc & improved command line. 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-07 20:24:08 +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
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
491cb95a1f utils/lxc.env: separate environment that is used in containers 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-03-01 18:28:10 +01:00
Markus Heiser
37c135f2ce LXC: improved UX when working with a bunch of containers 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-27 19:13:03 +01:00
Markus Heiser
af6acd3417 LXC: install searx-suite installs searx, filtron & morty on all containers 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-26 19:07:55 +01:00
Markus Heiser
d5917cc029 utils/lib.sh: make uWSGI installation available for all distros 
support: ubuntu, debin, fedora, archlinux

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-25 20:20:17 +01:00
Markus Heiser
f17b28743a utils/serx.sh: make uWSGI installation available for all distros (WIP) 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-23 21:05:22 +01:00
Markus Heiser
5fb6d4f508 LXC: normalize package installation & user creation. 
utils/lib.sh:
- get DIST_ID & DIST_VERSION from /etc/os-release
- pkg_[install|remove|...] supports ubuntu, debian, archlinux & fedora

utils/lxc.sh
- Workaround for the "setrlimit(RLIMIT_CORE): Operation not permitted" error::
    'Set disable_coredump false' >> /etc/sudo.conf

utils/[searx.sh|filtron.sh|morty.sh]
- switched user creation from 'adduser' perl script to 'useradd' built-in
  command

utils/searx.sh
- install packages for ubuntu, debian, archlinux & fedora

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-23 12:10:45 +01:00
Markus Heiser
59e4026762 searx.sh: install settings at /etc/searx/settings.yml 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-17 18:58:59 +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
Markus Heiser
ad32739860 shellcheck: fix usse -n instead of ! -z (SC2236 SC2237) 
- https://www.shellcheck.net/wiki/SC2236 -- Use -n instead of ! -z.
 - https://www.shellcheck.net/wiki/SC2237 -- Use [ -n .. ] instead of ! [ -z ....

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-16 20:07:37 +01:00
Markus Heiser
5c0f9c8c79 tooling box: varius fix from tests 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-08 17:12:01 +01:00
Markus Heiser
ed4cb4f160 tooling box: varius fix from tests 2020-02-08 13:24:08 +01:00
Markus Heiser
71d7550dbe tooling box ./utils/*: minor fix from production test 2020-02-04 19:47:33 +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
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
79e1f837ef utils & Makefile: add .config.mk & .config.sh for searx brands 
By isolating the environment of makefiles and bash scripts into .config.mk and
.config.sh it is simple to maintain searx brands by setting some central
environments.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-04 10:39:42 +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
a4437c47ac utils/morty.sh: add script to install morty result proxy 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-02 18:14:10 +01:00
Markus Heiser
709ac51d33 utils/filtron.sh: generalize systemd, accounts and golang tasks 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-01 16:59:27 +01:00
Markus Heiser
56a93ee770 utils/lib.sh: colorize messages 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-01-31 18:24:31 +01:00