ed4cb4f · searx · git.iko.soy

tooling box: varius fix from tests

commited4cb4f1603dc519aa42cc626874f23d2e9db84e authorMarkus Heiser <markus.heiser@darmarit.de> dateSat 8 Feb 2020, 13:24 (7 years ago) parentc8212b9

3 files changed+5−4

unifiedsplit

docs/admin/installation.rst+1−1

@@ -43,7 +43,7 @@ Install searx:

4343.. code:: sh

4444

4545 sudo -H useradd searx --system --disabled-password -d /usr/local/searx

46− sudo -H usermod -a -G shadow $SERVICE_USER

46+ sudo -H usermod -a -G shadow searx

4747 cd /usr/local/searx

4848 sudo -H git clone https://github.com/asciimoo/searx.git searx-src

4949 sudo -H chown searx:searx -R /usr/local/searx

utils/searx.sh+3−3

@@ -235,9 +235,9 @@ EOF

235235 configure_searx

236236

237237 rst_title "${SEARX_SETTINGS}" section

238− rstBlock 'Diff between new setting file (<) and backup (>):'

238+ rst_para 'Diff between new setting file (<) and backup (>):'

239239 echo

240− diff "$SEARX_SETTINGS}" "${SEARX_SETTINGS}.backup"

240+ $DIFF_CMD "${SEARX_SETTINGS}" "${SEARX_SETTINGS}.backup"

241241

242242 local action

243243 choose_one action "What should happen to the settings file? " \

@@ -438,7 +438,7 @@ deactivate_service() {

438438

439439git_diff() {

440440 sudo -H -u "${SERVICE_USER}" -i <<EOF

441−cd ${SEARX_REPO_FOLDER}

441+cd ${SEARX_SRC}

442442git --no-pager diff

443443EOF

444444}

utils/templates/etc/apache2/sites-available/searx.conf:filtron+1

@@ -5,6 +5,7 @@ ProxyPreserveHost On

55# SecRuleRemoveById 981054

66# SecRuleRemoveById 981059

77# SecRuleRemoveById 981060

8+# SecRuleRemoveById 950907

910<Location ${FILTRON_URL_PATH} >

1011