Browse Source

tooling box: varius fix from tests

Markus Heiser 5 years ago
parent
commit
ed4cb4f160

+ 1 - 1
docs/admin/installation.rst

@@ -43,7 +43,7 @@ Install searx:
 .. code:: sh
 
     sudo -H useradd searx --system --disabled-password -d /usr/local/searx
-    sudo -H usermod -a -G shadow $SERVICE_USER
+    sudo -H usermod -a -G shadow searx
     cd /usr/local/searx
     sudo -H git clone https://github.com/asciimoo/searx.git searx-src
     sudo -H chown searx:searx -R /usr/local/searx

+ 3 - 3
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
 }

+ 1 - 0
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} >