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

Commit 2523ef28 authored by Nicolas Gelot's avatar Nicolas Gelot
Browse files

Merge branch 'dev/update-from-upstream' into 'master' 

Update master from upstream

See merge request !188
parents 8556f878 d4c62f94

.env.prod

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ SEARX_SECRET="SECRET2BEREPLACED" 
SEARX_REDIS_HOST=redis

SEARX_UI_DEFAULT_THEME=etheme

SEARX_PROXY_HTTP=http://proxy01.ecloud.global:1099

SEARX_PROXY_HTTPS=http://proxy01.ecloud.global:1099

WIREGUARD_IP=127.0.0.1

NGINX_PORT=8088

INTERNAL_NETWORK_NAME=default

.github/ISSUE_TEMPLATE/engine-request.md

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ assignees: '' 
**How can SearXNG fetch the information from this engine?**

<!-- List API URL, example code (using the correct markdown) and more

that could be useful for the developers in order to implement this engine.

If you don't know what to write, let this part blank.>

If you don't know what to write, let this part blank. -->



**Applicable category of this engine**

<!-- Where should this new engine fit in SearXNG? Current categories in SearXNG:

.github/workflows/integration.yml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ jobs: 
    strategy:

      matrix:

        os: [ubuntu-20.04]

        python-version:  ["3.7", "3.8", "3.9", "3.10", "3.11"]

        python-version:  ["3.8", "3.9", "3.10", "3.11"]

    steps:

    - name: Checkout

      uses: actions/checkout@v2

.github/workflows/translations-update.yml

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ on: 


jobs:

  babel:

    name: "create PR for additons from weblate"

    name: "create PR for additions from weblate"

    runs-on: ubuntu-20.04

    if: ${{ github.repository_owner == 'searxng' && github.ref == 'refs/heads/master' }}

    steps:

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ test:unit: 
    - scp $ENV_FILE $SSH_USER@$BACKEND_HOST:$DEPLOYMENT_PATH/.env

    - ssh $SSH_USER@$BACKEND_HOST "cd $DEPLOYMENT_PATH

      && sed -i 's/SPOT_DOCKER_TAG=master/SPOT_DOCKER_TAG=$SPOT_DOCKER_TAG/g' .env

      && sed -i "s/GATEWAY_WG_IP/$GATEWAY_WG_IP/g" etc/nginx/nginx.conf

      && sed -i 's/set_real_ip_from 127.0.0.1/set_real_ip_from '$GATEWAY_WG_IP'/g' etc/nginx/nginx.conf

      && docker-compose pull && sleep 2 && docker-compose up -d --remove-orphans && docker-compose restart spot-nginx"



deploy:spot.murenatest.io.backend1: