Merge pull request #949 from return42/fix-inst-scripts

Browse Source 
Fix and improve installtion scripts in /utils
This commit is contained in:
Markus Heiser 2022-03-12 18:41:18 +01:00 committed by GitHub
commit e847313007
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 60 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utils/lxc-searx.env
View File

@ -23,10 +23,10 @@ lxc_set_suite_env() {
# end of standard support see https://wiki.ubuntu.com/Releases # end of standard support see https://wiki.ubuntu.com/Releases
"$LINUXCONTAINERS_ORG_NAME:ubuntu/18.04" "ubu1804" # April 2023 "$LINUXCONTAINERS_ORG_NAME:ubuntu/18.04" "ubu1804" # April 2023
"$LINUXCONTAINERS_ORG_NAME:ubuntu/20.04" "ubu2004" # April 2025 "$LINUXCONTAINERS_ORG_NAME:ubuntu/20.04" "ubu2004" # April 2025
"$LINUXCONTAINERS_ORG_NAME:ubuntu/20.10" "ubu2010" # July 2021 "$LINUXCONTAINERS_ORG_NAME:ubuntu/21.10" "ubu2110" # July 2027
# EOL see https://fedoraproject.org/wiki/Releases # EOL see https://fedoraproject.org/wiki/Releases
"$LINUXCONTAINERS_ORG_NAME:fedora/33" "fedora33" "$LINUXCONTAINERS_ORG_NAME:fedora/35" "fedora35"
# rolling releases see https://www.archlinux.org/releng/releases/ # rolling releases see https://www.archlinux.org/releng/releases/
"$LINUXCONTAINERS_ORG_NAME:archlinux" "archlinux" "$LINUXCONTAINERS_ORG_NAME:archlinux" "archlinux"

4
utils/lxc.sh
View File

@ -41,7 +41,7 @@ echo 'Set disable_coredump false' >> /etc/sudo.conf
" "
# shellcheck disable=SC2034 # shellcheck disable=SC2034
ubu2010_boilerplate="$ubu1904_boilerplate" ubu2110_boilerplate="$ubu1904_boilerplate"
# shellcheck disable=SC2034 # shellcheck disable=SC2034
archlinux_boilerplate=" archlinux_boilerplate="
@ -51,7 +51,7 @@ echo 'Set disable_coredump false' >> /etc/sudo.conf
" "
# shellcheck disable=SC2034 # shellcheck disable=SC2034
fedora33_boilerplate=" fedora35_boilerplate="
dnf update -y dnf update -y
dnf install -y git curl wget hostname dnf install -y git curl wget hostname
echo 'Set disable_coredump false' >> /etc/sudo.conf echo 'Set disable_coredump false' >> /etc/sudo.conf

8
utils/searx.sh
View File

@ -31,7 +31,7 @@ SEARX_SRC="${SERVICE_HOME}/searx-src"
SEARXNG_SETTINGS_PATH="/etc/searxng/settings.yml" SEARXNG_SETTINGS_PATH="/etc/searxng/settings.yml"
SEARXNG_UWSGI_APP="searxng.ini" SEARXNG_UWSGI_APP="searxng.ini"
# shellcheck disable=SC2034 # shellcheck disable=SC2034
SEARX_UWSGI_SOCKET="/run/uwsgi/app/searx/socket" SEARX_UWSGI_SOCKET="/run/uwsgi/app/searxng/socket"
# apt packages # apt packages
SEARX_PACKAGES_debian="\ SEARX_PACKAGES_debian="\
@ -58,9 +58,9 @@ texlive-core texlive-latexextra ttf-dejavu"
# dnf packages # dnf packages
SEARX_PACKAGES_fedora="\ SEARX_PACKAGES_fedora="\
python python-pip python-lxml python-babel python python-pip python-lxml python-babel python3-devel
uwsgi uwsgi-plugin-python3 uwsgi uwsgi-plugin-python3
git @development-tools libxml2 git @development-tools libxml2 openssl
ShellCheck" ShellCheck"
BUILD_PACKAGES_fedora="\ BUILD_PACKAGES_fedora="\
@ -118,7 +118,7 @@ case $DIST_ID-$DIST_VERS in
esac esac
# Apache Settings # Apache Settings
APACHE_SEARX_SITE="searx.conf" APACHE_SEARX_SITE="searxng.conf"
# shellcheck disable=SC2034 # shellcheck disable=SC2034
CONFIG_FILES=( CONFIG_FILES=(

16
utils/templates/etc/uwsgi/apps-archlinux/searxng.ini
View File

@ -1,3 +1,4 @@
# -*- mode: conf; coding: utf-8 -*-
[uwsgi] [uwsgi]
# uWSGI core # uWSGI core
@ -79,10 +80,17 @@ http = ${SEARX_INTERNAL_HTTP}
# #
# On some distributions you need to create the app folder for the sockets:: # On some distributions you need to create the app folder for the sockets::
# #
# mkdir -p /run/uwsgi/app/searx # mkdir -p ${SEARX_UWSGI_SOCKET}
# chown -R ${SERVICE_USER}:${SERVICE_GROUP} /run/uwsgi/app/searx # chown -R ${SERVICE_USER}:${SERVICE_GROUP} ${SEARX_UWSGI_SOCKET}
# #
# socket = /run/uwsgi/app/searx/socket # socket = ${SEARX_UWSGI_SOCKET}
# uwsgi serves the static files
# expires set to one year since there are hashes
static-map = /static=${SEARX_SRC}/searx/static
static-expires = /* 31557600
static-gzip-all = True
offload-threads = %k
# Cache # Cache
cache2 = name=searxcache,items=2000,blocks=2000,blocksize=4096,bitmap=1 cache2 = name=searxngcache,items=2000,blocks=2000,blocksize=4096,bitmap=1

17
utils/templates/etc/uwsgi/apps-archlinux/searxng.ini:socket
View File

@ -1,3 +1,4 @@
# -*- mode: conf; coding: utf-8 -*-
[uwsgi] [uwsgi]
# uWSGI core # uWSGI core
@ -79,7 +80,17 @@ pythonpath = ${SEARX_SRC}
# #
# On some distributions you need to create the app folder for the sockets:: # On some distributions you need to create the app folder for the sockets::
# #
# mkdir -p /run/uwsgi/app/searx # mkdir -p ${SEARX_UWSGI_SOCKET}
# chown -R ${SERVICE_USER}:${SERVICE_GROUP} /run/uwsgi/app/searx # chown -R ${SERVICE_USER}:${SERVICE_GROUP} ${SEARX_UWSGI_SOCKET}
# #
socket = /run/uwsgi/app/searx/socket socket = ${SEARX_UWSGI_SOCKET}
# uwsgi serves the static files
# expires set to one year since there are hashes
static-map = /static=${SEARX_SRC}/searx/static
static-expires = /* 31557600
static-gzip-all = True
offload-threads = %k
# Cache
cache2 = name=searxngcache,items=2000,blocks=2000,blocksize=4096,bitmap=1

16
utils/templates/etc/uwsgi/apps-available/searxng.ini
View File

@ -1,3 +1,4 @@
# -*- mode: conf; coding: utf-8 -*-
[uwsgi] [uwsgi]
# uWSGI core # uWSGI core
@ -78,10 +79,17 @@ http = ${SEARX_INTERNAL_HTTP}
# #
# On some distributions you need to create the app folder for the sockets:: # On some distributions you need to create the app folder for the sockets::
# #
# mkdir -p /run/uwsgi/app/searx # mkdir -p /run/uwsgi/app/searxng
# chown -R ${SERVICE_USER}:${SERVICE_GROUP} /run/uwsgi/app/searx # chown -R ${SERVICE_USER}:${SERVICE_GROUP} ${SEARX_UWSGI_SOCKET}
# #
# socket = /run/uwsgi/app/searx/socket # socket = ${SEARX_UWSGI_SOCKET}
# uwsgi serves the static files
# expires set to one year since there are hashes
static-map = /static=${SEARX_SRC}/searx/static
static-expires = /* 31557600
static-gzip-all = True
offload-threads = %k
# Cache # Cache
cache2 = name=searxcache,items=2000,blocks=2000,blocksize=4096,bitmap=1 cache2 = name=searxngcache,items=2000,blocks=2000,blocksize=4096,bitmap=1

17
utils/templates/etc/uwsgi/apps-available/searxng.ini:socket
View File

@ -1,3 +1,4 @@
# -*- mode: conf; coding: utf-8 -*-
[uwsgi] [uwsgi]
# uWSGI core # uWSGI core
@ -78,7 +79,17 @@ pythonpath = ${SEARX_SRC}
# #
# On some distributions you need to create the app folder for the sockets:: # On some distributions you need to create the app folder for the sockets::
# #
# mkdir -p /run/uwsgi/app/searx # mkdir -p ${SEARX_UWSGI_SOCKET}
# chown -R ${SERVICE_USER}:${SERVICE_GROUP} /run/uwsgi/app/searx # chown -R ${SERVICE_USER}:${SERVICE_GROUP} ${SEARX_UWSGI_SOCKET}
# #
socket = /run/uwsgi/app/searx/socket socket = ${SEARX_UWSGI_SOCKET}
# uwsgi serves the static files
# expires set to one year since there are hashes
static-map = /static=${SEARX_SRC}/searx/static
static-expires = /* 31557600
static-gzip-all = True
offload-threads = %k
# Cache
cache2 = name=searxngcache,items=2000,blocks=2000,blocksize=4096,bitmap=1