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

Commit 72e85bef authored by Florent VINCENT's avatar Florent VINCENT 👾
Browse files

modifications from latest reviews

parent 72eaab63

.env

+0 −1
Original line number Diff line number Diff line
@@ -9,6 +9,5 @@ SEARX_REDIS_HOST=redis 
SEARX_UI_DEFAULT_THEME=eelo

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

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

REPO_BASE=/PATH/TO/SPOT/FOLDER

FILTRON_PORT=8088

MORTY_PORT=8089
 
 No newline at end of file

.env.e→.env.prod

+2 −3
Original line number Diff line number Diff line
@@ -3,14 +3,13 @@ SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global 
SPOT_DOCKER_TAG=latest

SPOT_NGINX_DOCKER_TAG=latest

SEARX_MORTY_URL=https://localhost:8089

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

SEARX_MORTY_KEY="taKB1WGTa63LEI6RdjWWKshS4oYSHQWGu9Eyjr1OlpQ="

SEARX_SECRET="SECRET2BEREPLACED"

SEARX_MORTY_KEY="KEY2BEREPLACED"

SEARX_REDIS_HOST=redis

SEARX_UI_DEFAULT_THEME=eelo

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

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

WIREGUARD_IP=127.0.0.1 

REPO_BASE=/mnt/repo-base/PATH

FILTRON_PORT=8088

MORTY_PORT=8089

INTERNAL_NETWORK_NAME=default
 
 No newline at end of file

.gitlab-ci.yml

+8 −8
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ deploy:spot.eeo.one.backend1: 
    SPOT_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}

    SPOT_NGINX_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}

    WIREGUARD_IP: ${BACKEND1_WG_IP}

    REPO_BASE: /mnt/repo-base/staging-spot

    INTERNAL_NETWORK_NAME: staging-spot-default

    FILTRON_PORT: 8088

    MORTY_PORT: 8089
@@ -110,9 +109,10 @@ deploy:spot.eeo.one.backend1: 
      && sed -i 's/SPOT_DOCKER_TAG=latest/SPOT_DOCKER_TAG=$SPOT_DOCKER_TAG/g' .env 

      && sed -i 's/SPOT_NGINX_DOCKER_TAG=latest/SPOT_NGINX_DOCKER_TAG=$SPOT_NGINX_DOCKER_TAG/g' .env 

      && sed -i 's/localhost:8089/$SPOT_MORTY_HOSTNAME/g' .env 

      && sed -i 's/SECRET2BEREPLACED/$SEARX_SECRET/g' .env

      && sed -i 's/KEY2BEREPLACED/$SEARX_MORTY_KEY/g' .env

      && sed -i 's/proxy01.ecloud.global/proxy01.ecloud.global/g' .env

      && sed -i 's/WIREGUARD_IP=127.0.0.1/WIREGUARD_IP=$WIREGUARD_IP/g' .env 

      && sed -i 's/PATH/staging-spot/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"
@@ -136,7 +136,6 @@ deploy:spot.eeo.one.backend2: 
    SPOT_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}

    SPOT_NGINX_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}

    WIREGUARD_IP: ${BACKEND2_WG_IP}

    REPO_BASE: /mnt/repo-base/staging-spot

    INTERNAL_NETWORK_NAME: staging-spot-default

    FILTRON_PORT: 8088

    MORTY_PORT: 8089
@@ -151,9 +150,10 @@ deploy:spot.eeo.one.backend2: 
      && sed -i 's/SPOT_DOCKER_TAG=latest/SPOT_DOCKER_TAG=$SPOT_DOCKER_TAG/g' .env 

      && sed -i 's/SPOT_NGINX_DOCKER_TAG=latest/SPOT_NGINX_DOCKER_TAG=$SPOT_NGINX_DOCKER_TAG/g' .env 

      && sed -i 's/localhost:8089/$SPOT_MORTY_HOSTNAME/g' .env 

      && sed -i 's/SECRET2BEREPLACED/$SEARX_SECRET/g' .env

      && sed -i 's/KEY2BEREPLACED/$SEARX_MORTY_KEY/g' .env

      && sed -i 's/proxy01.ecloud.global/proxy02.ecloud.global/g' .env

      && sed -i 's/WIREGUARD_IP=127.0.0.1/WIREGUARD_IP=$WIREGUARD_IP/g' .env 

      && sed -i 's/PATH/staging-spot/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"
@@ -177,7 +177,6 @@ deploy:spot.ecloud.global.backend1: 
    SPOT_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}

    SPOT_NGINX_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}

    WIREGUARD_IP: ${BACKEND1_WG_IP}

    REPO_BASE: /mnt/repo-base/production-spot

    INTERNAL_NETWORK_NAME: spot-default

    FILTRON_PORT: 8098

    MORTY_PORT: 8099
@@ -193,9 +192,10 @@ deploy:spot.ecloud.global.backend1: 
      && sed -i 's/SPOT_DOCKER_TAG=latest/SPOT_DOCKER_TAG=$SPOT_DOCKER_TAG/g' .env 

      && sed -i 's/SPOT_NGINX_DOCKER_TAG=latest/SPOT_NGINX_DOCKER_TAG=$SPOT_NGINX_DOCKER_TAG/g' .env 

      && sed -i 's/localhost:8089/$SPOT_MORTY_HOSTNAME/g' .env 

      && sed -i 's/SECRET2BEREPLACED/$SEARX_SECRET/g' .env

      && sed -i 's/KEY2BEREPLACED/$SEARX_MORTY_KEY/g' .env

      && sed -i 's/proxy01.ecloud.global/proxy01.ecloud.global/g' .env

      && sed -i 's/WIREGUARD_IP=127.0.0.1/WIREGUARD_IP=$WIREGUARD_IP/g' .env 

      && sed -i 's/PATH/production-spot/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"
@@ -218,7 +218,6 @@ deploy:spot.ecloud.global.backend2: 
    SPOT_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}

    SPOT_NGINX_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}

    WIREGUARD_IP: ${BACKEND2_WG_IP}

    REPO_BASE: /mnt/repo-base/production-spot

    INTERNAL_NETWORK_NAME: spot-default

    FILTRON_PORT: 8098

    MORTY_PORT: 8099
@@ -234,9 +233,10 @@ deploy:spot.ecloud.global.backend2: 
      && sed -i 's/SPOT_DOCKER_TAG=latest/SPOT_DOCKER_TAG=$SPOT_DOCKER_TAG/g' .env 

      && sed -i 's/SPOT_NGINX_DOCKER_TAG=latest/SPOT_NGINX_DOCKER_TAG=$SPOT_NGINX_DOCKER_TAG/g' .env 

      && sed -i 's/localhost:8089/$SPOT_MORTY_HOSTNAME/g' .env 

      && sed -i 's/SECRET2BEREPLACED/$SEARX_SECRET/g' .env

      && sed -i 's/KEY2BEREPLACED/$SEARX_MORTY_KEY/g' .env

      && sed -i 's/proxy01.ecloud.global/proxy02.ecloud.global/g' .env

      && sed -i 's/WIREGUARD_IP=127.0.0.1/WIREGUARD_IP=$WIREGUARD_IP/g' .env 

      && sed -i 's/PATH/production-spot/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"

README.md

+0 −6
Original line number Diff line number Diff line
@@ -47,12 +47,6 @@ below to run spot for production or local environment. 
### Like production





update .env file with the path where spot is cloned : 



```

REPO_BASE=/PATH/TO/SPOT/FOLDER

```



Run the docker-compose to start the project



```

docker-compose.e.yml→docker-compose.prod.yml

+6 −6
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ services: 
    image: redis:5.0.7-alpine

    # container_name: spot-redis

    logging: *default-logging

    restart: unless-stopped

    restart: always

    networks:

      - ${INTERNAL_NETWORK_NAME}

    command: redis-server --maxmemory 8G --maxmemory-policy allkeys-lru
@@ -23,7 +23,7 @@ services: 
      context: .

      dockerfile: Dockerfile

    logging: *default-logging

    restart: unless-stopped

    restart: always

    networks:

      - ${INTERNAL_NETWORK_NAME}

    environment:
@@ -44,7 +44,7 @@ services: 
      context: .

      dockerfile: nginx.Dockerfile

    logging: *default-logging

    restart: unless-stopped

    restart: always

    networks:

      - ${INTERNAL_NETWORK_NAME}

    environment:
@@ -53,7 +53,7 @@ services: 
  filtron:

    image: dalf/filtron:latest

    logging: *default-logging

    restart: unless-stopped

    restart: always

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

    networks:

      - ${INTERNAL_NETWORK_NAME}
@@ -61,12 +61,12 @@ services: 
    ports:

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

    volumes:

      - ${REPO_BASE}/etc/filtron/rules.json:/etc/filtron/rules.json

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



  morty:

    image: dalf/morty:latest

    logging: *default-logging

    restart: unless-stopped

    restart: always

    networks:

      - ${INTERNAL_NETWORK_NAME}

      - spot-wireguarded