summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
Diffstat (limited to 'utils')
-rwxr-xr-xutils/searx.sh6
-rw-r--r--utils/templates/etc/apache2/sites-available/searx.conf:filtron1
2 files changed, 4 insertions, 3 deletions
diff --git a/utils/searx.sh b/utils/searx.sh
index ea6cb1e96..f02066ea0 100755
--- a/utils/searx.sh
+++ b/utils/searx.sh
@@ -235,9 +235,9 @@ EOF
configure_searx
rst_title "${SEARX_SETTINGS}" section
- rstBlock 'Diff between new setting file (<) and backup (>):'
+ rst_para 'Diff between new setting file (<) and backup (>):'
echo
- diff "$SEARX_SETTINGS}" "${SEARX_SETTINGS}.backup"
+ $DIFF_CMD "${SEARX_SETTINGS}" "${SEARX_SETTINGS}.backup"
local action
choose_one action "What should happen to the settings file? " \
@@ -438,7 +438,7 @@ deactivate_service() {
git_diff() {
sudo -H -u "${SERVICE_USER}" -i <<EOF
-cd ${SEARX_REPO_FOLDER}
+cd ${SEARX_SRC}
git --no-pager diff
EOF
}
diff --git a/utils/templates/etc/apache2/sites-available/searx.conf:filtron b/utils/templates/etc/apache2/sites-available/searx.conf:filtron
index 3f03dfadd..5ede66301 100644
--- a/utils/templates/etc/apache2/sites-available/searx.conf:filtron
+++ b/utils/templates/etc/apache2/sites-available/searx.conf:filtron
@@ -5,6 +5,7 @@ ProxyPreserveHost On
# SecRuleRemoveById 981054
# SecRuleRemoveById 981059
# SecRuleRemoveById 981060
+# SecRuleRemoveById 950907
<Location ${FILTRON_URL_PATH} >