diff options
Diffstat (limited to 'utils')
| -rwxr-xr-x | utils/filtron.sh | 2 | ||||
| -rwxr-xr-x | utils/lib.sh | 2 | ||||
| -rwxr-xr-x | utils/morty.sh | 8 | ||||
| -rwxr-xr-x | utils/searx.sh | 6 | ||||
| -rw-r--r-- | utils/templates/etc/apache2/sites-available/morty.conf | 5 | ||||
| -rw-r--r-- | utils/templates/etc/apache2/sites-available/searx.conf:filtron | 9 | ||||
| -rw-r--r-- | utils/templates/etc/apache2/sites-available/searx.conf:uwsgi | 2 |
7 files changed, 28 insertions, 6 deletions
diff --git a/utils/filtron.sh b/utils/filtron.sh index c1e360067..e97b9f014 100755 --- a/utils/filtron.sh +++ b/utils/filtron.sh @@ -96,7 +96,7 @@ If needed, set PUBLIC_URL of your WEB service in the '${DOT_CONFIG#"$REPO_ROOT/" FILTRON_TARGET : ${FILTRON_TARGET} EOF - [ ! -z ${1+x} ] && err_msg "$1" + [ ! -z "${1+x}" ] && err_msg "$1" } main() { diff --git a/utils/lib.sh b/utils/lib.sh index 05ff5e594..59ad12229 100755 --- a/utils/lib.sh +++ b/utils/lib.sh @@ -279,7 +279,7 @@ cache_download() { else wget --progress=bar -O "${CACHE}/$2" "$1" ; exit_value=$? fi - if [[ $exit_value = 0 ]]; then + if [[ ! $exit_value = 0 ]]; then err_msg "failed to download: $1" fi fi diff --git a/utils/morty.sh b/utils/morty.sh index 6c63351cf..7a9db08a8 100755 --- a/utils/morty.sh +++ b/utils/morty.sh @@ -84,7 +84,7 @@ ${DOT_CONFIG#"$REPO_ROOT/"} file:: SERVICE_USER : ${SERVICE_USER} EOF info_searx - [ ! -z ${1+x} ] && err_msg "$1" + [ ! -z "${1+x}" ] && err_msg "$1" } info_searx() { @@ -196,6 +196,12 @@ install_all() { if ! service_is_available "http://${MORTY_LISTEN}" ; then err_msg "Morty does not listening on: http://${MORTY_LISTEN}" fi + if apache_is_installed; then + info_msg "Apache is installed on this host." + if ask_yn "Do you want to install a reverse proxy (ProxyPass)" Yn; then + install_apache_site + fi + fi if ask_yn "Do you want to inspect the installation?" Yn; then inspect_service fi diff --git a/utils/searx.sh b/utils/searx.sh index 7609a4acf..ea6cb1e96 100755 --- a/utils/searx.sh +++ b/utils/searx.sh @@ -110,7 +110,7 @@ If needed, set PUBLIC_URL of your WEB service in the '${DOT_CONFIG#"$REPO_ROOT/" SERVICE_USER : ${SERVICE_USER} EOF - [ ! -z ${1+x} ] && err_msg "$1" + [ ! -z "${1+x}" ] && err_msg "$1" } main() { @@ -403,8 +403,8 @@ test_local_searx() { tee_stderr 0.1 <<EOF | sudo -H -u "${SERVICE_USER}" -i 2>&1 | prefix_stdout "$_service_prefix" cd ${SEARX_SRC} sed -i -e "s/debug : False/debug : True/g" "$SEARX_SETTINGS" -timeout 5 python3 searx/webapp.py & -sleep 1 +timeout 10 python3 searx/webapp.py & +sleep 3 curl --location --verbose --head --insecure $SEARX_INTERNAL_URL sed -i -e "s/debug : True/debug : False/g" "$SEARX_SETTINGS" EOF diff --git a/utils/templates/etc/apache2/sites-available/morty.conf b/utils/templates/etc/apache2/sites-available/morty.conf index 231b3fb79..6bcc77b78 100644 --- a/utils/templates/etc/apache2/sites-available/morty.conf +++ b/utils/templates/etc/apache2/sites-available/morty.conf @@ -4,7 +4,12 @@ ProxyPreserveHost On <Location ${PUBLIC_URL_PATH_MORTY} > + <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 diff --git a/utils/templates/etc/apache2/sites-available/searx.conf:filtron b/utils/templates/etc/apache2/sites-available/searx.conf:filtron index 11bd70376..3f03dfadd 100644 --- a/utils/templates/etc/apache2/sites-available/searx.conf:filtron +++ b/utils/templates/etc/apache2/sites-available/searx.conf:filtron @@ -2,9 +2,18 @@ ProxyPreserveHost On +# SecRuleRemoveById 981054 +# SecRuleRemoveById 981059 +# SecRuleRemoveById 981060 + <Location ${FILTRON_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 diff --git a/utils/templates/etc/apache2/sites-available/searx.conf:uwsgi b/utils/templates/etc/apache2/sites-available/searx.conf:uwsgi index 51cbdf41f..21e01ac4e 100644 --- a/utils/templates/etc/apache2/sites-available/searx.conf:uwsgi +++ b/utils/templates/etc/apache2/sites-available/searx.conf:uwsgi @@ -11,6 +11,8 @@ SecRuleEngine Off </IfModule> + Require all granted + Options FollowSymLinks Indexes SetHandler uwsgi-handler uWSGISocket ${SEARX_UWSGI_SOCKET} |