zaclys/searxng
1
0
Fork 1
mirror of https://github.com/searxng/searxng synced 2024-01-01 19:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Sync upstream

Browse source
This commit is contained in:
github-actions[bot] 2024-09-20 00:32:32 +00:00
commit a1fbf629a1
3 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
utils/lib.sh
View file

@ -958,7 +958,6 @@ nginx_distro_setup() {
;;
esac
}
nginx_distro_setup
install_nginx(){
info_msg "installing nginx ..."
@ -1127,8 +1126,6 @@ apache_distro_setup() {
esac
}
apache_distro_setup
install_apache(){
info_msg "installing apache ..."
pkg_install "$APACHE_PACKAGES"
@ -1291,8 +1288,6 @@ uWSGI_distro_setup() {
esac
}
uWSGI_distro_setup
install_uwsgi(){
info_msg "installing uwsgi ..."
pkg_install "$uWSGI_PACKAGES"
@ -1685,13 +1680,15 @@ LXC_BASE_PACKAGES_fedora="bash git @development-tools python"
# yum packages
LXC_BASE_PACKAGES_centos="bash git python3"
case $DIST_ID in
ubuntu|debian) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_debian}" ;;
arch) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_arch}" ;;
fedora) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_fedora}" ;;
centos) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_centos}" ;;
*) err_msg "$DIST_ID-$DIST_VERS: pkg_install LXC_BASE_PACKAGES not yet implemented" ;;
esac
lxc_distro_setup() {
case $DIST_ID in
ubuntu|debian) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_debian}" ;;
arch) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_arch}" ;;
fedora) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_fedora}" ;;
centos) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_centos}" ;;
*) err_msg "$DIST_ID-$DIST_VERS: pkg_install LXC_BASE_PACKAGES not yet implemented" ;;
esac
}
lxc_install_base_packages() {
info_msg "install LXC_BASE_PACKAGES in container $1"

2
utils/lxc.sh
View file

@ -135,6 +135,8 @@ main() {
local exit_val
local _usage="unknown or missing $1 command $2"
lxc_distro_setup
# don't check prerequisite when in recursion
if [[ ! $1 == __* ]] && [[ ! $1 == --help ]]; then
if ! in_container; then

17
utils/searxng.sh
View file

@ -164,9 +164,16 @@ EOF
}
main() {
required_commands \
sudo systemctl install git wget curl \
|| exit
case $1 in
install|remove|instance)
nginx_distro_setup
apache_distro_setup
uWSGI_distro_setup
required_commands \
sudo systemctl install git wget curl \
|| exit
;;
esac
local _usage="unknown or missing $1 command $2"
@ -898,6 +905,10 @@ _searxng.instance.inspect() {
}
searxng.doc.rst() {
local APACHE_SITES_AVAILABLE="/etc/apache2/sites-available"
local NGINX_APPS_AVAILABLE="/etc/nginx/default.apps-available"
local debian="${SEARXNG_PACKAGES_debian}"
local arch="${SEARXNG_PACKAGES_arch}"
local fedora="${SEARXNG_PACKAGES_fedora}"