filtron and morty ports added as vars to be able to overwrite them with gitlab ci. repo path too. (9c6d5961) · Commits · e / infra / spot

.env

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -11,3 +11,5 @@ SEARX_PROXY_HTTP=socks5h://tor-socks-proxy:9150
	SEARX_PROXY_HTTPS=socks5h://tor-socks-proxy:9150		SEARX_PROXY_HTTPS=socks5h://tor-socks-proxy:9150
	WIREGUARD_IP=127.0.0.1		WIREGUARD_IP=127.0.0.1
	REPO_BASE=/mnt/repo-base/staging-spot		REPO_BASE=/mnt/repo-base/staging-spot
			FILTRON_PORT=8088
			MORTY_PORT=8089
			No newline at end of file

.gitlab-ci.yml

+41 −8

Original line number	Original line	Diff line number	Diff line
	@@ -93,6 +93,9 @@ deploy:spot.eeo.one.backend1:
	SPOT_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}		SPOT_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}
	SPOT_NGINX_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}		SPOT_NGINX_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}
	WIREGUARD_IP: ${BACKEND1_WG_IP}		WIREGUARD_IP: ${BACKEND1_WG_IP}
			REPO_BASE: /mnt/repo-base/staging-spot
			FILTRON_PORT: 8088
			MORTY_PORT: 8089
	script:		script:
	- echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND1_HOST - $BACKEND1_WG_IP - $WIREGUARD_IP)"		- echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND1_HOST - $BACKEND1_WG_IP - $WIREGUARD_IP)"
	- docker-compose up -d --build --scale tor-socks-proxy=5		- docker-compose up -d --build --scale tor-socks-proxy=5
	@@ -115,30 +118,60 @@ deploy:spot.eeo.one.backend2:
	SPOT_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}		SPOT_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}
	SPOT_NGINX_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}		SPOT_NGINX_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}
	WIREGUARD_IP: ${BACKEND2_WG_IP}		WIREGUARD_IP: ${BACKEND2_WG_IP}
			REPO_BASE: /mnt/repo-base/staging-spot
			FILTRON_PORT: 8088
			MORTY_PORT: 8089
	script:		script:
	- echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND2_HOST - $BACKEND2_WG_IP - $WIREGUARD_IP)"		- echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND2_HOST - $BACKEND2_WG_IP - $WIREGUARD_IP)"
	- docker-compose up -d --build --scale tor-socks-proxy=5		- docker-compose up -d --build --scale tor-socks-proxy=5
	- docker-compose restart filtron		- docker-compose restart filtron


	deploy:spot.cloud.global:		deploy:spot.ecloud.global.backend1:
	extends: .deploy:template		extends: .deploy:template
	only:		only:
	- tags		- tags
	environment:		environment:
	name: prod		name: ecloud1
	url: https://spot.ecloud.global		url: https://spot.ecloud.global
	variables:		variables:
	DOCKER_HOST: ssh://spot@spot.ecloud.global		DOCKER_HOST: ssh://${SSH_USER}@${BACKEND1_HOST}
	FILTRON_RULES: /home/spot/filtron/rules.json
	SPOT_HOSTNAME: spot.ecloud.global		SPOT_HOSTNAME: spot.ecloud.global
	SPOT_MORTY_HOSTNAME: proxy.spot.ecloud.global		SPOT_MORTY_HOSTNAME: proxy.spot.ecloud.global
	SEARX_MORTY_URL: https://proxy.spot.ecloud.global		SEARX_MORTY_URL: https://proxy.spot.ecloud.global
	COMPOSE_PROJECT_NAME: my-spot		COMPOSE_PROJECT_NAME: production-spot
	SPOT_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}		SPOT_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}
	SPOT_NGINX_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}		SPOT_NGINX_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}
	PRIVATE_KEY: ${PRIVATE_KEY_PROD}		WIREGUARD_IP: ${BACKEND1_WG_IP}
			REPO_BASE: /mnt/repo-base/production-spot
			FILTRON_PORT: 8098
			MORTY_PORT: 8099
	script:		script:
	- docker-compose pull		- echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND1_HOST - $BACKEND1_WG_IP - $WIREGUARD_IP)"
	- docker-compose up -d --scale tor=5		- docker-compose up -d --build --scale tor-socks-proxy=5
	- docker-compose restart filtron		- docker-compose restart filtron

			deploy:spot.ecloud.global.backend2:
			extends: .deploy:template
			only:
			- tags
			environment:
			name: ecloud2
			url: https://spot.ecloud.global
			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
			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}
			REPO_BASE: /mnt/repo-base/production-spot
			FILTRON_PORT: 8098
			MORTY_PORT: 8099
			script:
			- echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND2_HOST - $BACKEND2_WG_IP - $WIREGUARD_IP)"
			- docker-compose up -d --build --scale tor-socks-proxy=5
			- docker-compose restart filtron

docker-compose.yml

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -61,7 +61,7 @@ services:
	- spot-default		- spot-default
	- spot-wireguarded		- spot-wireguarded
	ports:		ports:
	- ${WIREGUARD_IP}:8088:3000		- ${WIREGUARD_IP}:${FILTRON_PORT}:3000
	volumes:		volumes:
	- ${REPO_BASE}/etc/filtron/rules.json:/etc/filtron/rules.json		- ${REPO_BASE}/etc/filtron/rules.json:/etc/filtron/rules.json
	labels:		labels:
	@@ -77,7 +77,7 @@ services:
	- spot-default		- spot-default
	- spot-wireguarded		- spot-wireguarded
	ports:		ports:
	- ${WIREGUARD_IP}:8089:3000		- ${WIREGUARD_IP}:${MORTY_PORT}:3000
	environment:		environment:
	DEBUG: "false"		DEBUG: "false"
	MORTY_ADDRESS: ":3000"		MORTY_ADDRESS: ":3000"