kevadesu/costmikuSearch
1
0
Fork 0
forked from Icycoide/searxng
Code Pull requests Activity

apache: normalize installation (docs and script)s over all distros

Browse source 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
Markus Heiser 2020-04-07 18:31:51 +02:00
parent eb0d4646d8
commit ee39a098ac
13 changed files with 289 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

8
utils/filtron.sh
View file

@ -441,14 +441,12 @@ This installs a reverse proxy (ProxyPass) into apache site (${APACHE_FILTRON_SIT
! apache_is_installed && err_msg "Apache is not installed."
if ! ask_yn "Do you really want to continue?"; then
if ! ask_yn "Do you really want to continue?" Yn; then
return
else
install_apache
fi
a2enmod headers
a2enmod proxy
a2enmod proxy_http
echo
apache_install_site --variant=filtron "${APACHE_FILTRON_SITE}"

119
utils/lib.sh
View file

@ -627,21 +627,56 @@ EOF
# Apache
# ------
# FIXME: Arch Linux & RHEL should be added
apache_distro_setup() {
# shellcheck disable=SC2034
case $DIST_ID-$DIST_VERS in
ubuntu-*|debian-*)
# debian uses the /etc/apache2 path, while other distros use
# the apache default at /etc/httpd
APACHE_SITES_AVAILABLE="/etc/apache2/sites-available"
APACHE_SITES_ENABLED="/etc/apache2/sites-enabled"
APACHE_MODULES="/usr/lib/apache2/modules"
APACHE_PACKAGES="apache2"
;;
arch-*)
APACHE_SITES_AVAILABLE="/etc/httpd/sites-available"
APACHE_SITES_ENABLED="/etc/httpd/sites-enabled"
APACHE_MODULES="modules"
APACHE_PACKAGES="apache"
;;
fedora-*)
APACHE_SITES_AVAILABLE="/etc/httpd/sites-available"
APACHE_SITES_ENABLED="/etc/httpd/sites-enabled"
APACHE_MODULES="modules"
APACHE_PACKAGES="httpd"
;;
*)
err_msg "$DIST_ID-$DIST_VERS: apache not yet implemented"
;;
esac
}
if [[ -z "${APACHE_SITES_AVAILABE}" ]]; then
APACHE_SITES_AVAILABE="/etc/apache2/sites-available"
fi
apache_distro_setup
install_apache(){
info_msg "installing apache ..."
pkg_install "$APACHE_PACKAGES"
case $DIST_ID-$DIST_VERS in
arch-*|fedora-*)
if ! grep "IncludeOptional sites-enabled" "/etc/httpd/conf/httpd.conf"; then
echo "IncludeOptional sites-enabled/*.conf" >> "/etc/httpd/conf/httpd.conf"
fi
systemctl enable httpd
systemctl start httpd
;;
esac
}
apache_is_installed() {
case $DIST_ID-$DIST_VERS in
ubuntu-*|debian-*)
(command -v apachectl \
&& command -v a2ensite \
&& command -v a2dissite ) &>/dev/null
;;
arch) (command -v httpd) ;;
fedora) (command -v httpd) ;;
ubuntu-*|debian-*) (command -v apachectl) &>/dev/null;;
arch-*) (command -v httpd) &>/dev/null;;
fedora-*) (command -v httpd) &>/dev/null;;
esac
}
@ -649,8 +684,16 @@ apache_reload() {
info_msg "reload apache .."
echo
sudo -H apachectl configtest
sudo -H service apache2 force-reload
case $DIST_ID-$DIST_VERS in
ubuntu-*|debian-*)
sudo -H apachectl configtest
sudo -H systemctl force-reload apache2
;;
arch-*| fedora-*)
sudo -H httpd -t
sudo -H systemctl force-reload httpd
;;
esac
}
apache_install_site() {
@ -670,9 +713,8 @@ apache_install_site() {
done
install_template "${template_opts[@]}" \
"${APACHE_SITES_AVAILABE}/${pos_args[1]}" \
"${APACHE_SITES_AVAILABLE}/${pos_args[1]}" \
root root 644
apache_enable_site "${pos_args[1]}"
info_msg "installed apache site: ${pos_args[1]}"
}
@ -683,15 +725,32 @@ apache_remove_site() {
info_msg "remove apache site: $1"
apache_dissable_site "$1"
rm -f "${APACHE_SITES_AVAILABE}/$1"
rm -f "${APACHE_SITES_AVAILABLE}/$1"
}
apache_enable_site() {
# usage: apache_enable_site <mysite.conf>
info_msg "enable apache site: $1"
sudo -H a2ensite -q "$1"
local CONF="$1"
info_msg "enable apache site: ${CONF}"
case $DIST_ID-$DIST_VERS in
ubuntu-*|debian-*)
sudo -H a2ensite -q "${CONF}"
;;
arch-*)
mkdir -p "${APACHE_SITES_ENABLED}"
rm -f "${APACHE_SITES_ENABLED}/${CONF}"
ln -s "${APACHE_SITES_AVAILABLE}/${CONF}" "${APACHE_SITES_ENABLED}/${CONF}"
;;
fedora-*)
mkdir -p "${APACHE_SITES_ENABLED}"
rm -f "${APACHE_SITES_ENABLED}/${CONF}"
ln -s "${APACHE_SITES_AVAILABLE}/${CONF}" "${APACHE_SITES_ENABLED}/${CONF}"
;;
esac
apache_reload
}
@ -699,9 +758,25 @@ apache_dissable_site() {
# usage: apache_disable_site <mysite.conf>
info_msg "disable apache site: $1"
sudo -H a2dissite -q "$1"
apache_reload
local CONF="$1"
info_msg "disable apache site: ${CONF}"
case $DIST_ID-$DIST_VERS in
ubuntu-*|debian-*)
sudo -H a2dissite -q "${CONF}"
;;
arch-*)
mkdir -p "${APACHE_SITES_ENABLED}"
rm -f "${APACHE_SITES_ENABLED}/${CONF}"
ln -s "${APACHE_SITES_AVAILABLE}/${CONF}" "${APACHE_SITES_ENABLED}/${CONF}"
;;
fedora-*)
mkdir -p "${APACHE_SITES_ENABLED}"
rm -f "${APACHE_SITES_ENABLED}/${CONF}"
ln -s "${APACHE_SITES_AVAILABLE}/${CONF}" "${APACHE_SITES_ENABLED}/${CONF}"
;;
esac
}
# uWSGI
@ -741,7 +816,7 @@ uWSGI_distro_setup() {
uWSGI_GROUP="uwsgi"
;;
*)
info_msg "$DIST_ID-$DIST_VERS: uWSGI not yet implemented"
err_msg "$DIST_ID-$DIST_VERS: uWSGI not yet implemented"
;;
esac
}

9
utils/lxc.sh
View file

@ -98,7 +98,7 @@ start/stop
show
:info: show info of all (or <name>) containers from LXC suite
:config: show config of all (or <name>) containers from the LXC suite
:suite: show services of all the containers from the LXC suite
:suite: show services of all (or <name>) containers from the LXC suite
:images: show information of local images
cmd
use single qoutes to evaluate in container's bash, e.g. 'echo $(hostname)'
@ -294,11 +294,9 @@ main() {
build_all_containers() {
rst_title "Build all LXC containers of suite"
echo
usage_containers
lxc_copy_images_localy
echo
rst_title "build containers" section
echo
lxc_init_all_containers
lxc_config_all_containers
lxc_boilerplate_all_containers
@ -368,7 +366,6 @@ remove_containers() {
lxc_copy_images_localy() {
rst_title "copy images" section
echo
for ((i=0; i<${#LXC_SUITE[@]}; i+=2)); do
lxc_image_copy "${LXC_SUITE[i]}" "${LXC_SUITE[i+1]}"
done
@ -477,7 +474,7 @@ lxc_init_all_containers() {
local container_name
for ((i=0; i<${#LXC_SUITE[@]}; i+=2)); do
lxc_init_container "${LXC_SUITE[i+1]}" "${LXC_HOST_PREFIX}-${image_name}"
lxc_init_container "${LXC_SUITE[i+1]}" "${LXC_HOST_PREFIX}-${LXC_SUITE[i+1]}"
done
}

4
utils/makefile.include
View file

@ -1,9 +1,11 @@
# -*- coding: utf-8; mode: makefile-gmake -*-
ifeq (,$(wildcard /.lxcenv.mk))
PHONY += lxc-activate
PHONY += lxc-activate lxc-purge
lxc-activate:
@$(MAKE) -s -f /share/searx/utils/makefile.lxc lxc-activate
lxc-purge:
$(Q)rm -rf ./lxc
else
include /.lxcenv.mk
endif

9
utils/morty.sh
View file

@ -402,15 +402,12 @@ This installs a reverse proxy (ProxyPass) into apache site (${APACHE_MORTY_SITE}
! apache_is_installed && err_msg "Apache is not installed."
if ! ask_yn "Do you really want to continue?"; then
if ! ask_yn "Do you really want to continue?" Yn; then
return
else
install_apache
fi
a2enmod headers
a2enmod proxy
a2enmod proxy_http
echo
apache_install_site "${APACHE_MORTY_SITE}"
info_msg "testing public url .."

30
utils/searx.sh
View file

@ -75,21 +75,23 @@ texlive-xetex-bin texlive-collection-fontsrecommended
texlive-collection-latex dejavu-sans-fonts dejavu-serif-fonts
dejavu-sans-mono-fonts"
case $DIST_ID in
ubuntu|debian)
case $DIST_ID-$DIST_VERS in
ubuntu-16.04|ubuntu-18.04)
SEARX_PACKAGES="${SEARX_PACKAGES_debian}"
BUILD_PACKAGES="${BUILD_PACKAGES_debian}"
APACHE_PACKAGES="libapache2-mod-uwsgi"
APACHE_PACKAGES="$APACHE_PACKAGES libapache2-mod-proxy-uwsgi"
;;
arch)
ubuntu-*|debian-*)
SEARX_PACKAGES="${SEARX_PACKAGES_debian}"
BUILD_PACKAGES="${BUILD_PACKAGES_debian}"
;;
arch-*)
SEARX_PACKAGES="${SEARX_PACKAGES_arch}"
BUILD_PACKAGES="${BUILD_PACKAGES_arch}"
APACHE_PACKAGES="uwsgi"
;;
fedora)
fedora-*)
SEARX_PACKAGES="${SEARX_PACKAGES_fedora}"
BUILD_PACKAGES="${BUILD_PACKAGES_fedora}"
APACHE_PACKAGES="uwsgi"
;;
esac
@ -462,6 +464,7 @@ EOF
wait_key
info_msg "install needed python packages"
tee_stderr 0.1 <<EOF | sudo -H -u "${SERVICE_USER}" -i 2>&1 | prefix_stdout "$_service_prefix"
pip install wheel
${SEARX_SRC}/manage.sh update_packages
EOF
}
@ -735,21 +738,14 @@ This installs the searx uwsgi app as apache site. If your server is public to
the internet, you should instead use a reverse proxy (filtron) to block
excessively bot queries."
case $DIST_ID-$DIST_VERS in
ubuntu-*|debian-*) : ;;
*) err_msg "sorry distro $DIST_ID $DIST_VERS not yet supported"; exit 42 ;;
esac
! apache_is_installed && err_msg "Apache is not installed."
if ! ask_yn "Do you really want to install apache site for searx-uwsgi?"; then
if ! ask_yn "Do you really want to continue?" Yn; then
return
else
install_apache
fi
pkg_install "$APACHE_PACKAGES"
a2enmod uwsgi
echo
apache_install_site --variant=uwsgi "${APACHE_SEARX_SITE}"
if ! service_is_available "${PUBLIC_URL}"; then

1
utils/templates/etc/apache2 Symbolic link
View file

@ -0,0 +1 @@
httpd

27
utils/templates/etc/apache2/sites-available/searx.conf:uwsgi
View file

@ -1,27 +0,0 @@
# -*- coding: utf-8; mode: apache -*-
<IfModule mod_uwsgi.c>
# SetEnvIf Request_URI "${SEARX_URL_PATH}" dontlog
# CustomLog /dev/null combined env=dontlog
<Location ${SEARX_URL_PATH}>
<IfModule mod_security2.c>
SecRuleEngine Off
</IfModule>
Require all granted
Options FollowSymLinks Indexes
SetHandler uwsgi-handler
uWSGISocket ${SEARX_UWSGI_SOCKET}
Order deny,allow
Deny from all
# Allow from fd00::/8 192.168.0.0/16 fe80::/10 127.0.0.0/8 ::1
Allow from all
</Location>
</IfModule>

14
utils/templates/etc/apache2/sites-available/morty.conf → utils/templates/etc/httpd/sites-available/morty.conf
View file

@ -1,6 +1,12 @@
# -*- coding: utf-8; mode: apache -*-
ProxyPreserveHost On
LoadModule headers_module ${APACHE_MODULES}/mod_headers.so
LoadModule proxy_module ${APACHE_MODULES}/mod_proxy.so
LoadModule proxy_module ${APACHE_MODULES}/mod_proxy_http.so
#LoadModule setenvif_module ${APACHE_MODULES}/mod_setenvif.so
# SetEnvIf Request_URI "${PUBLIC_URL_PATH_MORTY}" dontlog
# CustomLog /dev/null combined env=dontlog
<Location ${PUBLIC_URL_PATH_MORTY} >
@ -15,12 +21,8 @@ ProxyPreserveHost On
#Allow from fd00::/8 192.168.0.0/16 fe80::/10 127.0.0.0/8 ::1
Allow from all
ProxyPreserveHost On
ProxyPass http://${MORTY_LISTEN}
RequestHeader set X-Script-Name ${PUBLIC_URL_PATH_MORTY}
# In Apache it seems, that setting HTTP_HOST header directive here does have
# no effect. I needed to set 'ProxyPreserveHost On' (see above).
# RequestHeader set Host ${PUBLIC_HOST}
</Location>

16
utils/templates/etc/apache2/sites-available/searx.conf:filtron → utils/templates/etc/httpd/sites-available/searx.conf:filtron
View file

@ -1,6 +1,12 @@
# -*- coding: utf-8; mode: apache -*-
ProxyPreserveHost On
LoadModule headers_module ${APACHE_MODULES}/mod_headers.so
LoadModule proxy_module ${APACHE_MODULES}/mod_proxy.so
LoadModule proxy_module ${APACHE_MODULES}/mod_proxy_http.so
#LoadModule setenvif_module ${APACHE_MODULES}/mod_setenvif.so
# SetEnvIf Request_URI "${FILTRON_URL_PATH}" dontlog
# CustomLog /dev/null combined env=dontlog
# SecRuleRemoveById 981054
# SecRuleRemoveById 981059
@ -20,14 +26,8 @@ ProxyPreserveHost On
#Allow from fd00::/8 192.168.0.0/16 fe80::/10 127.0.0.0/8 ::1
Allow from all
ProxyPreserveHost On
ProxyPass http://${FILTRON_LISTEN}
RequestHeader set X-Script-Name ${FILTRON_URL_PATH}
# In Apache it seems, that setting HTTP_HOST header directive here does have
# no effect. I needed to set 'ProxyPreserveHost On' (see above). HTTP_HOST
# (ProxyPreserveHost On) is needed by searx to render correct *Search URL*
# in the *Link* box and *saved preference*.
# RequestHeader set Host ${PUBLIC_HOST}
</Location>

27
utils/templates/etc/httpd/sites-available/searx.conf:uwsgi Normal file
View file

@ -0,0 +1,27 @@
# -*- coding: utf-8; mode: apache -*-
LoadModule headers_module ${APACHE_MODULES}/mod_headers.so
LoadModule proxy_module ${APACHE_MODULES}/mod_proxy.so
LoadModule proxy_uwsgi_module ${APACHE_MODULES}/mod_proxy_uwsgi.so
# LoadModule setenvif_module ${APACHE_MODULES}/mod_setenvif.so
# SetEnvIf Request_URI "${SEARX_URL_PATH}" dontlog
# CustomLog /dev/null combined env=dontlog
<Location ${SEARX_URL_PATH}>
<IfModule mod_security2.c>
SecRuleEngine Off
</IfModule>
Require all granted
Order deny,allow
Deny from all
# Allow from fd00::/8 192.168.0.0/16 fe80::/10 127.0.0.0/8 ::1
Allow from all
ProxyPreserveHost On
ProxyPass unix:${SEARX_UWSGI_SOCKET}|uwsgi://uwsgi-uds-searx/
</Location>