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

Commit 8a3b854b authored by Nicolas Gelot's avatar Nicolas Gelot
Browse files

Update settings/doc to running spot in dev mode

parent 48b5e0a8

.env

+7 −3
Original line number Diff line number Diff line 
SPOT_HOSTNAME=spot.ecloud.global

SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global

SPOT_MORTY_URL=http://localhost:8089

SPOT_DOCKER_TAG=latest

SPOT_NGINX_DOCKER_TAG=latest

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

MORTY_KEY="taKB1WGTa63LEI6RdjWWKshS4oYSHQWGu9Eyjr1OlpQ="
 
SEARX_MORTY_URL=http://localhost:8089

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

SEARX_MORTY_KEY="taKB1WGTa63LEI6RdjWWKshS4oYSHQWGu9Eyjr1OlpQ="

SEARX_REDIS_HOST=redis

SEARX_UI_DEFAULT_THEME=eelo

SEARX_PROXY_HTTP=socks5://tor:9050

SEARX_PROXY_HTTPS=socks5://tor:9050

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ deploy:spot.test.cloud.global: 
    FILTRON_RULES: /etc/filtron/rules.json

    SPOT_HOSTNAME: spot.test.ecloud.global

    SPOT_MORTY_HOSTNAME: proxy.spot.test.ecloud.global

    SPOT_MORTY_URL: https://proxy.spot.test.ecloud.global

    SEARX_MORTY_URL: https://proxy.spot.test.ecloud.global

    COMPOSE_PROJECT_NAME: my-spot

    SSH_PRIVATE_KEY: ${SSH_PRIVATE_KEY_TEST}

  script:
@@ -106,7 +106,7 @@ deploy:spot.cloud.global: 
    FILTRON_RULES: /home/spot/filtron/rules.json

    SPOT_HOSTNAME: spot.ecloud.global

    SPOT_MORTY_HOSTNAME: proxy.spot.ecloud.global

    SPOT_MORTY_URL: https://proxy.spot.ecloud.global

    SEARX_MORTY_URL: https://proxy.spot.ecloud.global

    COMPOSE_PROJECT_NAME: my-spot

    SPOT_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}

    SPOT_NGINX_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}

README.md

+5 −6
Original line number Diff line number Diff line
@@ -57,12 +57,11 @@ Then go to http://localhost:8088. 
### For developer



You can directly run spot, with a python command inside a docker container which

contains all dependencies.

contains all dependencies. After running the docker-compose stack you can stop

the default spot service and run the debug one with Flask server.



```

docker-compose up -d redis

docker run -it --rm -v $(pwd):/ws -w /ws --network=my-spot_default registry.gitlab.e.foundation:5000/e/cloud/my-spot/env sh

PYTHONPATH=$(pwd) SEARX_REDIS_HOST=redis SEARX_DEBUG=1 python -X dev searx/webapp.py

docker-compose rm -sf spot

docker run -it --rm -v $(pwd):/ws -w /ws --hostname spot --network=my-spot_default --env-file .env registry.gitlab.e.foundation:5000/e/cloud/my-spot/env bash

PYTHONPATH=$(pwd) SEARX_DEBUG=1 python -X dev searx/webapp.py

```
 


Then, open your browser and navigate to the container IP.

docker-compose.yml

+9 −9
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ services: 
    logging: *default-logging

    restart: unless-stopped

    environment:

      SEARX_SECRET: "${SPOT_SECRET}"

      SEARX_MORTY_URL: "${SPOT_MORTY_URL}"

      SEARX_MORTY_KEY: "${MORTY_KEY}"

      SEARX_PROXY_HTTP: "socks5://tor:9050"

      SEARX_PROXY_HTTPS: "socks5://tor:9050"

      SEARX_REDIS_HOST: "redis"

      SEARX_UI_DEFAULT_THEME: "eelo"

      SEARX_SECRET: "${SEARX_SECRET}"

      SEARX_MORTY_URL: "${SEARX_MORTY_URL}"

      SEARX_MORTY_KEY: "${SEARX_MORTY_KEY}"

      SEARX_PROXY_HTTP: "${SEARX_PROXY_HTTP}"

      SEARX_PROXY_HTTPS: "${SEARX_PROXY_HTTPS}"

      SEARX_REDIS_HOST: "${SEARX_REDIS_HOST}"

      SEARX_UI_DEFAULT_THEME: "${SEARX_UI_DEFAULT_THEME}"

      GUNICORN_LOGGER: 1

      GUNICORN_LEVEL: INFO
@@ -40,7 +40,7 @@ services: 
    logging: *default-logging

    restart: unless-stopped

    environment:

      SPOT_MORTY_URL: "${SPOT_MORTY_URL}"

      SEARX_MORTY_URL: "${SEARX_MORTY_URL}"



  filtron:

    image: dalf/filtron:latest
@@ -64,7 +64,7 @@ services: 
    environment:

      DEBUG: "false"

      MORTY_ADDRESS: ":3000"

      MORTY_KEY: "${MORTY_KEY}"

      MORTY_KEY: "${SEARX_MORTY_KEY}"

    labels:

      - "traefik.enable=true"

      - "traefik.http.routers.morty.rule=Host(`${SPOT_MORTY_HOSTNAME}`)"

etc/nginx/conf.d/spot.conf

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ server { 
  server_name _;



  add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload";

  add_header Content-Security-Policy "default-src 'none'; script-src 'self'; style-src 'self' 'unsafe-inline'; form-action 'self'; font-src 'self'; frame-ancestors 'self'; base-uri 'self'; connect-src 'self' https://overpass-api.de; img-src 'self' __SPOT_MORTY_URL__ data: https://*.tile.openstreetmap.org; frame-src https://www.youtube-nocookie.com https://player.vimeo.com https://www.dailymotion.com https://www.deezer.com https://www.mixcloud.com https://w.soundcloud.com https://embed.spotify.com";

  add_header Content-Security-Policy "default-src 'none'; script-src 'self'; style-src 'self' 'unsafe-inline'; form-action 'self'; font-src 'self'; frame-ancestors 'self'; base-uri 'self'; connect-src 'self' https://overpass-api.de; img-src 'self' __SEARX_MORTY_URL__ data: https://*.tile.openstreetmap.org; frame-src https://www.youtube-nocookie.com https://player.vimeo.com https://www.dailymotion.com https://www.deezer.com https://www.mixcloud.com https://w.soundcloud.com https://embed.spotify.com";

  add_header X-Frame-Options "SAMEORIGIN";



  root /var/www/spot;