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

Commit 3948411c authored by Nivesh Krishna's avatar Nivesh Krishna
Browse files

Merge branch '4434-safesearch-ddg' of gitlab.e.foundation:e/cloud/my-spot into 4434-safesearch-ddg

parents 889e5623 fd9d7fdb

.env

+2 −1
Original line number Diff line number Diff line
@@ -11,3 +11,4 @@ SEARX_PROXY_HTTP=socks5h://tor-socks-proxy:9150 
SEARX_PROXY_HTTPS=socks5h://tor-socks-proxy:9150

FILTRON_PORT=8088

MORTY_PORT=8089

NODE_NAME=local
 
 No newline at end of file

.env.prod

+2 −1
Original line number Diff line number Diff line
@@ -13,3 +13,4 @@ WIREGUARD_IP=127.0.0.1 
FILTRON_PORT=8088

MORTY_PORT=8089

INTERNAL_NETWORK_NAME=default

NODE_NAME=spot11
 
 No newline at end of file

.gitlab-ci.yml

+8 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ 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}

    NODE_NAME: ${NODE_NAME}

    INTERNAL_NETWORK_NAME: staging-spot-default

    FILTRON_PORT: 8088

    MORTY_PORT: 8089
@@ -108,6 +109,7 @@ deploy:spot.eeo.one.backend1: 
      && 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

      && sed -i 's/NODE_NAME=spot11/NODE_NAME=$NODE_NAME/g' .env

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



deploy:spot.eeo.one.backend2:
@@ -130,6 +132,7 @@ deploy:spot.eeo.one.backend2: 
    SPOT_NGINX_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}

    WIREGUARD_IP: ${BACKEND2_WG_IP}

    INTERNAL_NETWORK_NAME: staging-spot-default

    NODE_NAME: ${NODE_NAME}

    FILTRON_PORT: 8088

    MORTY_PORT: 8089

  script:
@@ -148,6 +151,7 @@ deploy:spot.eeo.one.backend2: 
      && 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

      && sed -i 's/NODE_NAME=spot11/NODE_NAME=$NODE_NAME/g' .env

      && docker-compose pull && docker-compose stop filtron && sleep 5 && docker-compose up -d"



deploy:spot.ecloud.global.backend1:
@@ -169,6 +173,7 @@ deploy:spot.ecloud.global.backend1: 
    SPOT_NGINX_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}

    WIREGUARD_IP: ${BACKEND1_WG_IP}

    INTERNAL_NETWORK_NAME: spot-default

    NODE_NAME: ${NODE_NAME}

    FILTRON_PORT: 8098

    MORTY_PORT: 8099

  script:
@@ -187,6 +192,7 @@ deploy:spot.ecloud.global.backend1: 
      && 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

      && sed -i 's/NODE_NAME=spot11/NODE_NAME=$NODE_NAME/g' .env

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



deploy:spot.ecloud.global.backend2:
@@ -208,6 +214,7 @@ deploy:spot.ecloud.global.backend2: 
    SPOT_NGINX_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}

    WIREGUARD_IP: ${BACKEND2_WG_IP}

    INTERNAL_NETWORK_NAME: spot-default

    NODE_NAME: ${NODE_NAME}

    FILTRON_PORT: 8098

    MORTY_PORT: 8099

  script:
@@ -226,5 +233,6 @@ deploy:spot.ecloud.global.backend2: 
      && 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

      && sed -i 's/NODE_NAME=spot11/NODE_NAME=$NODE_NAME/g' .env

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

docker-compose.prod.yml

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ services: 
      SEARX_UI_DEFAULT_THEME: "${SEARX_UI_DEFAULT_THEME}"

      GUNICORN_LOGGER: 1

      GUNICORN_LEVEL: INFO

      NODE_NAME: "${NODE_NAME}"



  spot-nginx:

    image: registry.gitlab.e.foundation:5000/e/cloud/my-spot/nginx:${SPOT_NGINX_DOCKER_TAG}

docker-compose.yml

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ services: 
      SEARX_UI_DEFAULT_THEME: "${SEARX_UI_DEFAULT_THEME}"

      GUNICORN_LOGGER: 1

      GUNICORN_LEVEL: INFO

      NODE_NAME: ${NODE_NAME}



  spot-nginx:

    image: registry.gitlab.e.foundation:5000/e/cloud/my-spot/nginx:${SPOT_NGINX_DOCKER_TAG}