diff options
| author | Markus Heiser <markus.heiser@darmarit.de> | 2020-02-08 13:24:08 +0100 |
|---|---|---|
| committer | Markus Heiser <markus.heiser@darmarit.de> | 2020-02-08 13:24:08 +0100 |
| commit | ed4cb4f1603dc519aa42cc626874f23d2e9db84e (patch) | |
| tree | e6fcdee6fa999719f7867ed51f2b39f3ab721c8c | |
| parent | c8212b9f4d4eeef635a541e6df367276bda23b34 (diff) | |
| download | searxng-ed4cb4f1603dc519aa42cc626874f23d2e9db84e.tar.gz searxng-ed4cb4f1603dc519aa42cc626874f23d2e9db84e.zip | |
tooling box: varius fix from tests
| -rw-r--r-- | docs/admin/installation.rst | 2 | ||||
| -rwxr-xr-x | utils/searx.sh | 6 | ||||
| -rw-r--r-- | utils/templates/etc/apache2/sites-available/searx.conf:filtron | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/docs/admin/installation.rst b/docs/admin/installation.rst index a901fee1c..67358e996 100644 --- a/docs/admin/installation.rst +++ b/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 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} > |