Merge pull request #1332 from return42/searxng-install (645c2a2c) · Commits · e / infra / spot

.config.sh

deleted100644 → 0

+0 −52

Original line number	Diff line number	Diff line
		# -- coding: utf-8; mode: sh --
		# SPDX-License-Identifier: AGPL-3.0-or-later
		# shellcheck shell=bash disable=SC2034
		#
		# This file should be edited only ones just before the installation of any
		# service is done. After the installation of the searx service a copy of this
		# file is placed into the $SEARX_SRC of the instance, e.g.::
		#
		# /usr/local/searx/searx-src/.config.sh
		#
		# .. hint::
		#
		# Before you change a value here, You have to fully uninstall any previous
		# installation of searx, morty and filtron services!

		# utils/searx.sh
		# --------------

		# The setup of the SearXNG instance is done in the settings.yml
		# (SEARXNG_SETTINGS_PATH). Read the remarks in [1] carefully and don't forget to
		# rebuild instance's environment (make buildenv) if needed. The settings.yml
		# file of an already installed instance is shown by::
		#
		# $ ./utils/searx.sh --help
		# ---- SearXNG instance setup (already installed)
		# SEARXNG_SETTINGS_PATH : /etc/searxng/settings.yml
		# SEARX_SRC : /usr/local/searx/searx-src
		#
		# [1] https://docs.searxng.org/admin/engines/settings.html

		# utils/filtron.sh
		# ----------------

		# FILTRON_API="127.0.0.1:4005"
		# FILTRON_LISTEN="127.0.0.1:4004"

		# utils/morty.sh
		# --------------

		# morty listen address
		# MORTY_LISTEN="127.0.0.1:3000"
		# PUBLIC_URL_PATH_MORTY="/morty/"

		# system services
		# ---------------

		# Common $HOME folder of the service accounts
		# SERVICE_HOME_BASE="/usr/local"

		# experimental: Set SERVICE_USER to run all services by one account, but be
		# aware that removing discrete components might conflict!
		# SERVICE_USER=searx

.github/workflows/data-update.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ jobs:

		- name: Install Ubuntu packages
		run: \|
		sudo ./utils/searx.sh install packages
		sudo ./utils/searxng.sh install packages

		- name: Set up Python
		uses: actions/setup-python@v2

.github/workflows/integration.yml

+3 −3

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ jobs:
		uses: actions/checkout@v2
		- name: Install Ubuntu packages
		run: \|
		sudo ./utils/searx.sh install packages
		sudo ./utils/searxng.sh install packages
		sudo apt install firefox
		- name: Set up Python
		uses: actions/setup-python@v2
		@@ -55,7 +55,7 @@ jobs:
		- name: Checkout
		uses: actions/checkout@v2
		- name: Install Ubuntu packages
		run: sudo ./utils/searx.sh install buildhost
		run: sudo ./utils/searxng.sh install buildhost
		- name: Set up Python
		uses: actions/setup-python@v2
		with:
		@@ -82,7 +82,7 @@ jobs:
		fetch-depth: '0'
		persist-credentials: false
		- name: Install Ubuntu packages
		run: sudo ./utils/searx.sh install buildhost
		run: sudo ./utils/searxng.sh install buildhost
		- name: Set up Python
		uses: actions/setup-python@v2
		with:

Makefile

+2 −3

Original line number	Diff line number	Diff line
		@@ -59,17 +59,16 @@ test.shell:
		utils/brand.env \
		$(MTOOLS) \
		utils/lib.sh \
		utils/lib_install.sh \
		utils/lib_nvm.sh \
		utils/lib_static.sh \
		utils/lib_go.sh \
		utils/lib_redis.sh \
		utils/filtron.sh \
		utils/searx.sh \
		utils/searxng.sh \
		utils/morty.sh \
		utils/lxc.sh \
		utils/lxc-searx.env \
		.config.sh
		utils/lxc-searxng.env
		$(Q)$(MTOOLS) build_msg TEST "$@ OK"

docs/admin/arch_public.dot

+18 −21

Original line number	Diff line number	Diff line
		digraph G {

		node [style=filled, shape=box, fillcolor="#ffffcc", fontname="Sans"];
		node [style=filled, shape=box, fillcolor="#ffffcc", fontname=Sans];
		edge [fontname="Sans"];

		browser [label="Browser", shape=Mdiamond];
		rp [label="Reverse Proxy", href="https://docs.searxng.org/utils/filtron.sh.html#public-reverse-proxy"];
		filtron [label="Filtron", href="https://docs.searxng.org/utils/filtron.sh.html"];
		morty [label="Morty", href="https://docs.searxng.org/utils/morty.sh.html"];
		static [label="Static files", href="url to configure static files"];
		uwsgi [label="uwsgi", href="https://docs.searxng.org/utils/searx.sh.html"]
		searx1 [label="Searx #1"];
		searx2 [label="Searx #2"];
		searx3 [label="Searx #3"];
		searx4 [label="Searx #4"];
		browser [label="browser", shape=tab, fillcolor=aliceblue];
		rp [label="reverse proxy"];
		static [label="static files", shape=folder, href="url to configure static files", fillcolor=lightgray];
		uwsgi [label="uwsgi", shape=parallelogram href="https://docs.searxng.org/utils/searx.sh.html"]
		redis [label="redis DB", shape=cylinder];
		searxng1 [label="SearXNG #1", fontcolor=blue3];
		searxng2 [label="SearXNG #2", fontcolor=blue3];
		searxng3 [label="SearXNG #3", fontcolor=blue3];
		searxng4 [label="SearXNG #4", fontcolor=blue3];

		browser -> rp [label="HTTPS"]

		subgraph cluster_searx {
		label = "Searx instance" fontname="Sans";
		subgraph cluster_searxng {
		label = "SearXNG instance" fontname=Sans;
		bgcolor="#fafafa";
		{ rank=same; static rp };
		rp -> morty [label="optional: images and HTML pages proxy"];
		rp -> static [label="optional: reverse proxy serves directly static files"];
		rp -> filtron [label="HTTP"];
		filtron -> uwsgi [label="HTTP"];
		uwsgi -> searx1;
		uwsgi -> searx2;
		uwsgi -> searx3;
		uwsgi -> searx4;
		rp -> static [label="optional: reverse proxy serves static files", fillcolor=slategray, fontcolor=slategray];
		rp -> uwsgi [label="http:// (tcp) or unix:// (socket)"];
		uwsgi -> searxng1 -> redis;
		uwsgi -> searxng2 -> redis;
		uwsgi -> searxng3 -> redis;
		uwsgi -> searxng4 -> redis;
		}

		}