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

Verified Commit 2740ea6e authored by Nicolas Gelot's avatar Nicolas Gelot
Browse files

Remove filtron service

parent 1298d062

.env

+1 −1
Original line number Diff line number Diff line
@@ -6,6 +6,6 @@ SEARX_REDIS_HOST=redis 
SEARX_UI_DEFAULT_THEME=etheme

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

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

FILTRON_PORT=8088

NGINX_PORT=8088

NODE_NAME=local

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

.env.prod

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 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

FILTRON_PORT=8088

NGINX_PORT=8088

INTERNAL_NETWORK_NAME=default

NODE_NAME=spot11

CI_REGISTRY_IMAGE=image

.gitlab-ci.yml

+2 −2
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

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

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



deploy:spot.murenatest.io.backend1:

  extends: .deploy:template

README.md

+2 −4
Original line number Diff line number Diff line
@@ -14,9 +14,8 @@ Spot was forked from searx: read [documentation](https://asciimoo.github.io/sear 


## Architecture



6 services are used for production:

3 services are used for production:



* [filtron](https://github.com/asciimoo/filtron) as reverse HTTP proxy to filter requests by different rules.

* [nginx](https://www.nginx.com/) as http server to serve static files.

* Spot the meta search engine.

* [redis](https://redis.io/) as memory storage to cache http requests
@@ -24,8 +23,7 @@ Spot was forked from searx: read [documentation](https://asciimoo.github.io/sear 


```mermaid

graph TD

  A(reverse proxy) --> |http://localhost:8088| B(filtron)

  B --> C(nginx)

  A(reverse proxy) --> |http://localhost:8088| C(nginx)

  C --> |static file| C

  C --> |API| D(spot)

  D --> E(proxy service)

docker-compose.prod.yml

+2 −12
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ services: 
          tag: docker-${ENVIRONMENT_NAME}-spot-nginx

    networks:

      - ${INTERNAL_NETWORK_NAME}

-   ports:

-     - ${WIREGUARD_IP}:${NGINX_PORT}:80

    volumes:

      - ./etc/nginx/conf.d/spot.conf:/etc/nginx/conf.d/default.conf

      - ./etc/nginx/nginx.conf:/etc/nginx/nginx.conf
@@ -51,18 +53,6 @@ services: 
    labels:

      - "com.centurylinklabs.watchtower.scope=staging-spot"



  filtron:

    image: dalf/filtron:latest

    restart: always

    command: -listen :3000 -rules /etc/filtron/rules.json -target spot-nginx

    networks:

      - ${INTERNAL_NETWORK_NAME}

      - spot-wireguarded

    ports:

      - ${WIREGUARD_IP}:${FILTRON_PORT}:3000

    volumes:

      - ./etc/filtron/rules.json:/etc/filtron/rules.json



  watchtower:

    image: containrrr/watchtower

    volumes: