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

Unverified Commit 5695289e authored by Akhil's avatar Akhil
Browse files

Merge branch 'master' of https://gitlab.e.foundation/e/infra/spot

parents 1298d062 efcf4dd3

.env

+1 −4
Original line number Original line Diff line number Diff line 
SPOT_HOSTNAME=spot.ecloud.global

SPOT_HOSTNAME=spot.ecloud.global

SPOT_DOCKER_TAG=latest

SPOT_DOCKER_TAG=latest

SEARX_MORTY_URL=https://localhost:8089

SEARX_SECRET=":@)%NN0+OqNdy:{prWQlZ{p9|oO9p-UyJq@%V!~G:arrSx6fXz.{jd%=XF44ncj"

SEARX_SECRET=":@)%NN0+OqNdy:{prWQlZ{p9|oO9p-UyJq@%V!~G:arrSx6fXz.{jd%=XF44ncj"

SEARX_REDIS_HOST=redis

SEARX_REDIS_HOST=redis

SEARX_UI_DEFAULT_THEME=etheme

SEARX_UI_DEFAULT_THEME=etheme

SEARX_PROXY_HTTP=socks5h://tor-socks-proxy:9150

NGINX_PORT=8088

SEARX_PROXY_HTTPS=socks5h://tor-socks-proxy:9150

FILTRON_PORT=8088

NODE_NAME=local

NODE_NAME=local

CI_REGISTRY_IMAGE=registry.gitlab.e.foundation/e/infra/spot
 
CI_REGISTRY_IMAGE=registry.gitlab.e.foundation/e/infra/spot

.env.prod

+2 −3
Original line number Original line Diff line number Diff line
@@ -4,9 +4,8 @@ SEARX_SECRET="SECRET2BEREPLACED" 
SEARX_REDIS_HOST=redis

SEARX_REDIS_HOST=redis

SEARX_UI_DEFAULT_THEME=etheme

SEARX_UI_DEFAULT_THEME=etheme

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

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

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

WIREGUARD_IP=127.0.0.1

WIREGUARD_IP=127.0.0.1

FILTRON_PORT=8088

NGINX_PORT=8088

INTERNAL_NETWORK_NAME=default

INTERNAL_NETWORK_NAME=default

NODE_NAME=spot11

NODE_NAME=spot11

CI_REGISTRY_IMAGE=image

CI_REGISTRY_IMAGE=image

.github/ISSUE_TEMPLATE/engine-request.md

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

**How can SearXNG fetch the information from this engine?**

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

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

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

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**

**Applicable category of this engine**

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

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

.github/workflows/integration.yml

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

    strategy:

      matrix:

      matrix:

        os: [ubuntu-20.04]

        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:

    steps:

    - name: Checkout

    - name: Checkout

      uses: actions/checkout@v2

      uses: actions/checkout@v2

.github/workflows/translations-update.yml

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




jobs:

jobs:

  babel:

  babel:

    name: "create PR for additons from weblate"

    name: "create PR for additions from weblate"

    runs-on: ubuntu-20.04

    runs-on: ubuntu-20.04

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

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

    steps:

    steps: