Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed4cb4f1 authored by Markus Heiser's avatar Markus Heiser
Browse files

tooling box: varius fix from tests

parent c8212b9f

docs/admin/installation.rst

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

utils/searx.sh

+3 −3
Original line number Original line Diff line number Diff line
@@ -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

}

}

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -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} >