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

Commit 55b97a36 authored by Nivesh Krishna's avatar Nivesh Krishna
Browse files

revert unnecessary changes

parent 7b4e076b

.gitlab-ci.yml

+5 −9
Original line number Diff line number Diff line
@@ -109,7 +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

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

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



deploy:spot.eeo.one.backend2:

  extends: .deploy:template
@@ -187,10 +187,8 @@ deploy:spot.ecloud.global.backend1: 
      && sed -i 's/WIREGUARD_IP=127.0.0.1/WIREGUARD_IP=$WIREGUARD_IP/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"

    - docker-compose pull

    - docker-compose stop filtron

    - docker-compose up -d

      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env

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



deploy:spot.ecloud.global.backend2:

  extends: .deploy:template
@@ -228,8 +226,6 @@ deploy:spot.ecloud.global.backend2: 
      && sed -i 's/WIREGUARD_IP=127.0.0.1/WIREGUARD_IP=$WIREGUARD_IP/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"

    - docker-compose pull

    - docker-compose stop filtron

    - docker-compose up -d

      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env

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

docker-compose.prod.yml

+2 −5
Original line number Diff line number Diff line
@@ -54,17 +54,14 @@ services: 
    image: dalf/filtron:latest

    logging: *default-logging

    restart: always

    depends_on: 

      - spot-nginx

      - morty

    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:rw

    entrypoint: ["/usr/local/filtron/filtron", "--rules", "/etc/filtron/rules.json", "-listen", "3000", "-target", "spot-nginx"]

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



  morty:

    image: dalf/morty:latest