on master help sign in
tooling box: varius fix from tests
ed4cb4fMarkus Heiser
docs/admin/installation.rst+1−1
@@ -43,7 +43,7 @@ Install searx:
43.. code:: sh
43.. code:: sh
44
44
45 sudo -H useradd searx --system --disabled-password -d /usr/local/searx
45 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
47 cd /usr/local/searx
47 cd /usr/local/searx
48 sudo -H git clone https://github.com/asciimoo/searx.git searx-src
48 sudo -H git clone https://github.com/asciimoo/searx.git searx-src
49 sudo -H chown searx:searx -R /usr/local/searx
49 sudo -H chown searx:searx -R /usr/local/searx
utils/searx.sh+3−3
@@ -235,9 +235,9 @@ EOF
235 configure_searx
235 configure_searx
236
236
237 rst_title "${SEARX_SETTINGS}" section
237 rst_title "${SEARX_SETTINGS}" section
238− rstBlock 'Diff between new setting file (<) and backup (>):'
238+ rst_para 'Diff between new setting file (<) and backup (>):'
239 echo
239 echo
240− diff "$SEARX_SETTINGS}" "${SEARX_SETTINGS}.backup"
240+ $DIFF_CMD "${SEARX_SETTINGS}" "${SEARX_SETTINGS}.backup"
241
241
242 local action
242 local action
243 choose_one action "What should happen to the settings file? " \
243 choose_one action "What should happen to the settings file? " \
@@ -438,7 +438,7 @@ deactivate_service() {
438
438
439git_diff() {
439git_diff() {
440 sudo -H -u "${SERVICE_USER}" -i <<EOF
440 sudo -H -u "${SERVICE_USER}" -i <<EOF
441−cd ${SEARX_REPO_FOLDER}
441+cd ${SEARX_SRC}
442git --no-pager diff
442git --no-pager diff
443EOF
443EOF
444}
444}
utils/templates/etc/apache2/sites-available/searx.conf:filtron+1
@@ -5,6 +5,7 @@ ProxyPreserveHost On
5# SecRuleRemoveById 981054
5# SecRuleRemoveById 981054
6# SecRuleRemoveById 981059
6# SecRuleRemoveById 981059
7# SecRuleRemoveById 981060
7# SecRuleRemoveById 981060
8+# SecRuleRemoveById 950907
8
9
9<Location ${FILTRON_URL_PATH} >
10<Location ${FILTRON_URL_PATH} >
10
11