tooling box: varius fix from tests

This commit is contained in:
Markus Heiser 2020-02-08 13:24:08 +01:00
parent c8212b9f4d
commit ed4cb4f160
3 changed files with 5 additions and 4 deletions

View File

@ -43,7 +43,7 @@ Install searx:
.. code:: sh .. code:: sh
sudo -H useradd searx --system --disabled-password -d /usr/local/searx 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 cd /usr/local/searx
sudo -H git clone https://github.com/asciimoo/searx.git searx-src sudo -H git clone https://github.com/asciimoo/searx.git searx-src
sudo -H chown searx:searx -R /usr/local/searx sudo -H chown searx:searx -R /usr/local/searx

View File

@ -235,9 +235,9 @@ EOF
configure_searx configure_searx
rst_title "${SEARX_SETTINGS}" section rst_title "${SEARX_SETTINGS}" section
rstBlock 'Diff between new setting file (<) and backup (>):' rst_para 'Diff between new setting file (<) and backup (>):'
echo echo
diff "$SEARX_SETTINGS}" "${SEARX_SETTINGS}.backup" $DIFF_CMD "${SEARX_SETTINGS}" "${SEARX_SETTINGS}.backup"
local action local action
choose_one action "What should happen to the settings file? " \ choose_one action "What should happen to the settings file? " \
@ -438,7 +438,7 @@ deactivate_service() {
git_diff() { git_diff() {
sudo -H -u "${SERVICE_USER}" -i <<EOF sudo -H -u "${SERVICE_USER}" -i <<EOF
cd ${SEARX_REPO_FOLDER} cd ${SEARX_SRC}
git --no-pager diff git --no-pager diff
EOF EOF
} }

View File

@ -5,6 +5,7 @@ ProxyPreserveHost On
# SecRuleRemoveById 981054 # SecRuleRemoveById 981054
# SecRuleRemoveById 981059 # SecRuleRemoveById 981059
# SecRuleRemoveById 981060 # SecRuleRemoveById 981060
# SecRuleRemoveById 950907
<Location ${FILTRON_URL_PATH} > <Location ${FILTRON_URL_PATH} >