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

Commit 04b01ab2 authored by Israel Yago Pereira's avatar Israel Yago Pereira
Browse files

Merge branch 'master' into 4174-fix-onesearch

parents 4ab91990 c81c05f5

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -26,3 +26,5 @@ dist/ 
local/

gh-pages/

searx.egg-info/



*.eggs
 
 No newline at end of file

.gitlab-ci.yml

+13 −19
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ python: 
build:web:

  stage: build

  before_script:

    - ./manage node.update

    - ./manage node.env

  script:

    - ./manage themes.etheme
@@ -95,9 +96,7 @@ deploy:spot.eeo.one.backend1: 
    MORTY_PORT: 8089

  script:

    - echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND1_HOST - $BACKEND1_WG_IP - $WIREGUARD_IP)" 

    - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/staging-spot && git stash && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"

    - docker-compose up -d --build

    - docker-compose restart filtron

    - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/staging-spot && git reset --hard && git clean -xfdf && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"

    - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/staging-spot 

      && sed -i 's/SPOT_HOSTNAME=spot.ecloud.global/SPOT_HOSTNAME=$SPOT_HOSTNAME/g' .env 

      && sed -i 's/SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global/SPOT_MORTY_HOSTNAME=$SPOT_MORTY_HOSTNAME/g' .env
@@ -110,7 +109,8 @@ deploy:spot.eeo.one.backend1: 
      && sed -i 's/WIREGUARD_IP=127.0.0.1/WIREGUARD_IP=$WIREGUARD_IP/g' .env 

      && sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/g' .env

      && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env

      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env"

      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env

      && docker-compose pull && docker-compose stop filtron && sleep 2 && docker-compose up -d --build"



deploy:spot.eeo.one.backend2:

  extends: .deploy:template
@@ -136,9 +136,7 @@ deploy:spot.eeo.one.backend2: 
    MORTY_PORT: 8089

  script:

    - echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND2_HOST - $BACKEND2_WG_IP - $WIREGUARD_IP)" 

    - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/staging-spot && git stash && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"

    - docker-compose up -d --build

    - docker-compose restart filtron

    - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/staging-spot && git reset --hard && git clean -xfdf && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"

    - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/staging-spot 

      && sed -i 's/SPOT_HOSTNAME=spot.ecloud.global/SPOT_HOSTNAME=$SPOT_HOSTNAME/g' .env 

      && sed -i 's/SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global/SPOT_MORTY_HOSTNAME=$SPOT_MORTY_HOSTNAME/g' .env
@@ -151,8 +149,8 @@ deploy:spot.eeo.one.backend2: 
      && sed -i 's/WIREGUARD_IP=127.0.0.1/WIREGUARD_IP=$WIREGUARD_IP/g' .env 

      && sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/g' .env

      && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env

      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env"



      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env

      && docker-compose pull && docker-compose stop filtron && sleep 5 && docker-compose up -d --build"



deploy:spot.ecloud.global.backend1:

  extends: .deploy:template
@@ -177,10 +175,7 @@ deploy:spot.ecloud.global.backend1: 
    MORTY_PORT: 8099

  script:

    - echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND1_HOST - $BACKEND1_WG_IP - $WIREGUARD_IP)" 

    - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/production-spot && git stash && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"

    - docker-compose pull

    - docker-compose up -d

    - docker-compose restart filtron

    - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/production-spot && git reset --hard && git clean -xfdf && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"

    - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/production-spot 

      && sed -i 's/SPOT_HOSTNAME=spot.ecloud.global/SPOT_HOSTNAME=$SPOT_HOSTNAME/g' .env 

      && sed -i 's/SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global/SPOT_MORTY_HOSTNAME=$SPOT_MORTY_HOSTNAME/g' .env
@@ -193,7 +188,8 @@ deploy:spot.ecloud.global.backend1: 
      && sed -i 's/WIREGUARD_IP=127.0.0.1/WIREGUARD_IP=$WIREGUARD_IP/g' .env 

      && sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/g' .env

      && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env

      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env"

      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env

      && docker-compose pull && docker-compose stop filtron && sleep 2 && docker-compose up -d"



deploy:spot.ecloud.global.backend2:

  extends: .deploy:template
@@ -218,10 +214,7 @@ deploy:spot.ecloud.global.backend2: 
    MORTY_PORT: 8099

  script:

    - echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND2_HOST - $BACKEND2_WG_IP - $WIREGUARD_IP)" 

    - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/production-spot && git stash && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"

    - docker-compose pull

    - docker-compose up -d

    - docker-compose restart filtron

    - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/production-spot && git reset --hard && git clean -xfdf && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"

    - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/production-spot 

      && sed -i 's/SPOT_HOSTNAME=spot.ecloud.global/SPOT_HOSTNAME=$SPOT_HOSTNAME/g' .env 

      && sed -i 's/SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global/SPOT_MORTY_HOSTNAME=$SPOT_MORTY_HOSTNAME/g' .env
@@ -234,5 +227,6 @@ deploy:spot.ecloud.global.backend2: 
      && sed -i 's/WIREGUARD_IP=127.0.0.1/WIREGUARD_IP=$WIREGUARD_IP/g' .env 

      && sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/g' .env

      && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env

      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env"

      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env

      && docker-compose pull && docker-compose stop filtron && sleep 2 && docker-compose up -d"

manage

+13 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ source_dot_config 


PY_SETUP_EXTRAS='[test]'

NPM_PACKAGES="less@2.7 less-plugin-clean-css grunt-cli"

NPM_VERSION="6.14.5"

GECKODRIVER_VERSION="v0.28.0"

# SPHINXOPTS=
@@ -281,12 +282,24 @@ gecko.driver() { 
    dump_return $?

}



node.update() {



    which npm &> /dev/null || die 1 'node.env - npm is not found!'



    build_msg INFO "npm version $(npm --version)"



    build_msg UPDATE "npm $NPM_VERSION"

    npm install npm@$NPM_VERSION -g



}



node.env() {

    local err=0

    pushd "${REPO_ROOT}" &> /dev/null

    # shellcheck disable=SC2230

    which npm &> /dev/null || die 1 'node.env - npm is not found!'



    build_msg INFO "npm version $(npm --version)"

    (   set -e

        # shellcheck disable=SC2030

        PATH="$(npm bin):$PATH"

package-lock.json

deleted100644 → 0
+0 −945

File deleted.

Preview size limit exceeded, changes collapsed.

searx/network/network.py

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ def initialize(settings_engines=None, settings_outgoing=None): 
        # from https://github.com/psf/requests/blob/8c211a96cdbe9fe320d63d9e1ae15c5c07e179f8/requests/models.py#L55

        'max_redirects': settings_outgoing.get('max_redirects', 30),

        #

        'retries': settings_outgoing.get('retries', 0),

        'retries': settings_outgoing.get('retries', 3),

        'retry_on_http_error': None,

    }