Merge branch 'remove-morty' into 'master' (a79ea38d) · Commits · e / infra / spot

.env

+0 −4

Original line number	Diff line number	Diff line
		SPOT_HOSTNAME=spot.ecloud.global
		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_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
		MORTY_PORT=8089
		NODE_NAME=local
		CI_REGISTRY_IMAGE=registry.gitlab.e.foundation/e/infra/spot
		No newline at end of file

.env.prod

+0 −5

Original line number	Diff line number	Diff line
		SPOT_HOSTNAME=spot.ecloud.global
		SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global
		SPOT_DOCKER_TAG=latest
		SPOT_NGINX_DOCKER_TAG=latest
		SEARX_MORTY_URL=https://localhost:8089
		SEARX_SECRET="SECRET2BEREPLACED"
		SEARX_MORTY_KEY="KEY2BEREPLACED"
		SEARX_REDIS_HOST=redis
		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
		MORTY_PORT=8089
		INTERNAL_NETWORK_NAME=default
		NODE_NAME=spot11
		CI_REGISTRY_IMAGE=image

.gitlab-ci.yml

+0 −40

Original line number	Diff line number	Diff line
		@@ -36,8 +36,6 @@ build:web:
		- docker tag $CI_REGISTRY_IMAGE/env base-env-image
		- docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG .
		- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
		- docker build -t $CI_REGISTRY_IMAGE/nginx:$CI_COMMIT_REF_SLUG -f nginx.Dockerfile .
		- docker push $CI_REGISTRY_IMAGE/nginx:$CI_COMMIT_REF_SLUG

		build:docker:
		extends: .build:docker
		@@ -49,8 +47,6 @@ build:docker:tags:
		- docker tag $CI_REGISTRY_IMAGE/env base-env-image
		- docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG .
		- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
		- docker build -t $CI_REGISTRY_IMAGE/nginx:$CI_COMMIT_REF_SLUG -f nginx.Dockerfile .
		- docker push $CI_REGISTRY_IMAGE/nginx:$CI_COMMIT_REF_SLUG
		only:
		- tags

		@@ -85,33 +81,24 @@ deploy:spot.eeo.one.backend1:
		variables:
		DOCKER_HOST: ssh://${SSH_USER}@${BACKEND1_HOST}
		SPOT_HOSTNAME: spot.eeo.one
		SPOT_MORTY_HOSTNAME: proxy.spot.eeo.one
		SEARX_MORTY_URL: https://proxy.spot.eeo.one
		SEARX_PROXY_HTTP: http://proxy01.ecloud.global:1099
		SEARX_PROXY_HTTPS: http://proxy01.ecloud.global:1099
		COMPOSE_PROJECT_NAME: staging-spot
		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
		script:
		- echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND1_HOST - $BACKEND1_WG_IP - $WIREGUARD_IP)"
		- ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/staging-spot && git reset --hard && git clean -xfdf && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"
		- ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/staging-spot
		&& sed -i 's/SPOT_HOSTNAME=spot.ecloud.global/SPOT_HOSTNAME=$SPOT_HOSTNAME/g' .env
		&& sed -i 's/SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global/SPOT_MORTY_HOSTNAME=$SPOT_MORTY_HOSTNAME/g' .env
		&& 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/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
		&& sed -i 's\|CI_REGISTRY_IMAGE=image\|CI_REGISTRY_IMAGE=$CI_REGISTRY_IMAGE\|g' .env
		@@ -128,33 +115,24 @@ deploy:spot.eeo.one.backend2:
		variables:
		DOCKER_HOST: ssh://${SSH_USER}@${BACKEND2_HOST}
		SPOT_HOSTNAME: spot.eeo.one
		SPOT_MORTY_HOSTNAME: proxy.spot.eeo.one
		SEARX_MORTY_URL: https://proxy.spot.eeo.one
		SEARX_PROXY_HTTP: http://proxy02.ecloud.global:1099
		SEARX_PROXY_HTTPS: http://proxy02.ecloud.global:1099
		COMPOSE_PROJECT_NAME: staging-spot
		SPOT_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}
		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:
		- echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND2_HOST - $BACKEND2_WG_IP - $WIREGUARD_IP)"
		- ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/staging-spot && git reset --hard && git clean -xfdf && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"
		- ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/staging-spot
		&& sed -i 's/SPOT_HOSTNAME=spot.ecloud.global/SPOT_HOSTNAME=$SPOT_HOSTNAME/g' .env
		&& sed -i 's/SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global/SPOT_MORTY_HOSTNAME=$SPOT_MORTY_HOSTNAME/g' .env
		&& 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/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
		&& sed -i 's\|CI_REGISTRY_IMAGE=image\|CI_REGISTRY_IMAGE=$CI_REGISTRY_IMAGE\|g' .env
		@@ -170,33 +148,24 @@ deploy:spot.ecloud.global.backend1:
		variables:
		DOCKER_HOST: ssh://${SSH_USER}@${BACKEND1_HOST}
		SPOT_HOSTNAME: spot.ecloud.global
		SPOT_MORTY_HOSTNAME: proxy.spot.ecloud.global
		SEARX_MORTY_URL: https://proxy.spot.ecloud.global
		SEARX_PROXY_HTTP: http://proxy01.ecloud.global:1099
		SEARX_PROXY_HTTPS: http://proxy01.ecloud.global:1099
		COMPOSE_PROJECT_NAME: production-spot
		SPOT_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}
		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:
		- echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND1_HOST - $BACKEND1_WG_IP - $WIREGUARD_IP)"
		- ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/production-spot && git reset --hard && git clean -xfdf && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"
		- ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/production-spot
		&& sed -i 's/SPOT_HOSTNAME=spot.ecloud.global/SPOT_HOSTNAME=$SPOT_HOSTNAME/g' .env
		&& sed -i 's/SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global/SPOT_MORTY_HOSTNAME=$SPOT_MORTY_HOSTNAME/g' .env
		&& 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/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
		&& sed -i 's\|CI_REGISTRY_IMAGE=image\|CI_REGISTRY_IMAGE=$CI_REGISTRY_IMAGE\|g' .env
		@@ -212,33 +181,24 @@ deploy:spot.ecloud.global.backend2:
		variables:
		DOCKER_HOST: ssh://${SSH_USER}@${BACKEND2_HOST}
		SPOT_HOSTNAME: spot.ecloud.global
		SPOT_MORTY_HOSTNAME: proxy.spot.ecloud.global
		SEARX_MORTY_URL: https://proxy.spot.ecloud.global
		SEARX_PROXY_HTTP: http://proxy02.ecloud.global:1099
		SEARX_PROXY_HTTPS: http://proxy02.ecloud.global:1099
		COMPOSE_PROJECT_NAME: production-spot
		SPOT_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}
		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:
		- echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND2_HOST - $BACKEND2_WG_IP - $WIREGUARD_IP)"
		- ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/production-spot && git reset --hard && git clean -xfdf && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"
		- ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/production-spot
		&& sed -i 's/SPOT_HOSTNAME=spot.ecloud.global/SPOT_HOSTNAME=$SPOT_HOSTNAME/g' .env
		&& sed -i 's/SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global/SPOT_MORTY_HOSTNAME=$SPOT_MORTY_HOSTNAME/g' .env
		&& 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/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
		&& sed -i 's\|CI_REGISTRY_IMAGE=image\|CI_REGISTRY_IMAGE=$CI_REGISTRY_IMAGE\|g' .env

docker-compose.prod.yml

+7 −23

Original line number	Diff line number	Diff line
		@@ -28,8 +28,6 @@ services:
		- ${INTERNAL_NETWORK_NAME}
		environment:
		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}"
		@@ -39,17 +37,17 @@ services:
		NODE_NAME: "${NODE_NAME}"

		spot-nginx:
		image: ${CI_REGISTRY_IMAGE}/nginx:${SPOT_NGINX_DOCKER_TAG}
		image: nginx:1.21
		# container_name: spot-nginx
		build:
		context: .
		dockerfile: nginx.Dockerfile
		logging: *default-logging
		restart: always
		networks:
		- ${INTERNAL_NETWORK_NAME}
		environment:
		SEARX_MORTY_URL: "${SEARX_MORTY_URL}"
		volumes:
		- ./etc/nginx/conf.d/spot.conf:/etc/nginx/conf.d/default.conf
		- ./etc/nginx/nginx.conf:/etc/nginx/nginx.conf
		- ./etc/nginx/proxy_spot_params:/etc/nginx/proxy_spot_params
		- ./searx/static:/var/www/spot/static

		filtron:
		image: dalf/filtron:latest
		@@ -64,20 +62,6 @@ services:
		volumes:
		- ./etc/filtron/rules.json:/etc/filtron/rules.json

		morty:
		image: dalf/morty:latest
		logging: *default-logging
		restart: always
		networks:
		- ${INTERNAL_NETWORK_NAME}
		- spot-wireguarded
		ports:
		- ${WIREGUARD_IP}:${MORTY_PORT}:3000
		environment:
		DEBUG: "false"
		MORTY_ADDRESS: ":3000"
		MORTY_KEY: "${SEARX_MORTY_KEY}"


		networks:
		staging-spot-default:

docker-compose.yml

+1 −27

Original line number	Diff line number	Diff line
		@@ -23,8 +23,6 @@ services:
		restart: unless-stopped
		environment:
		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}"
		@@ -33,40 +31,16 @@ services:
		GUNICORN_LEVEL: INFO
		NODE_NAME: ${NODE_NAME}

		spot-nginx:
		image: ${CI_REGISTRY_IMAGE}/nginx:${SPOT_NGINX_DOCKER_TAG}
		build:
		context: .
		dockerfile: nginx.Dockerfile
		logging: *default-logging
		restart: unless-stopped
		environment:
		SEARX_MORTY_URL: "${SEARX_MORTY_URL}"

		filtron:
		image: dalf/filtron:latest
		logging: *default-logging
		restart: unless-stopped
		command: -listen :3000 -rules /etc/filtron/rules.json -target spot-nginx
		command: -listen :3000 -rules /etc/filtron/rules.json -target spot
		ports:
		- ${FILTRON_PORT}:3000
		volumes:
		- ./etc/filtron/rules.json:/etc/filtron/rules.json

		morty:
		image: dalf/morty:latest
		logging: *default-logging
		restart: unless-stopped
		ports:
		- ${MORTY_PORT}:3000
		environment:
		DEBUG: "false"
		MORTY_ADDRESS: ":3000"
		MORTY_KEY: "${SEARX_MORTY_KEY}"

		tor-socks-proxy:
		image: peterdavehello/tor-socks-proxy:latest
		logging: *default-logging
		restart: unless-stopped