generic vars in env for ci sed substitutions (50591328) · Commits · e / infra / spot

.env

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -10,7 +10,7 @@ SEARX_UI_DEFAULT_THEME=eelo
	SEARX_PROXY_HTTP=http://proxy01.ecloud.global:1099		SEARX_PROXY_HTTP=http://proxy01.ecloud.global:1099
	SEARX_PROXY_HTTPS=http://proxy01.ecloud.global:1099		SEARX_PROXY_HTTPS=http://proxy01.ecloud.global:1099
	WIREGUARD_IP=127.0.0.1		WIREGUARD_IP=127.0.0.1
	REPO_BASE=/mnt/repo-base/staging-spot		REPO_BASE=/mnt/repo-base/PATH
	FILTRON_PORT=8088		FILTRON_PORT=8088
	MORTY_PORT=8089		MORTY_PORT=8089
	INTERNAL_NETWORK_NAME=staging-spot-default		INTERNAL_NETWORK_NAME=default
	No newline at end of file		No newline at end of file

.gitlab-ci.yml

+10 −8

Original line number	Original line	Diff line number	Diff line
	@@ -111,9 +111,10 @@ deploy:spot.eeo.one.backend1:
	&& sed -i 's/localhost:8089/$SPOT_MORTY_HOSTNAME/g' .env		&& sed -i 's/localhost:8089/$SPOT_MORTY_HOSTNAME/g' .env
	&& sed -i 's/proxy01.ecloud.global/proxy01.ecloud.global/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/WIREGUARD_IP=127.0.0.1/WIREGUARD_IP=$WIREGUARD_IP/g' .env
			&& sed -i 's/PATH/staging-spot/g'
	&& sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/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/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env
	&& sed -i 's/INTERNAL_NETWORK_NAME=staging-spot-default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env"		&& sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env"

	deploy:spot.eeo.one.backend2:		deploy:spot.eeo.one.backend2:
	extends: .deploy:template		extends: .deploy:template
	@@ -142,7 +143,7 @@ deploy:spot.eeo.one.backend2:
	- 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		- docker-compose up -d --build
	- docker-compose restart filtron		- docker-compose restart filtron
	- ssh $SSH_USER@$BACKEND1_HOST "cd $REPO_BASE		- ssh $SSH_USER@$BACKEND2_HOST "cd $REPO_BASE
	&& sed -i 's/SPOT_HOSTNAME=spot.ecloud.global/SPOT_HOSTNAME=$SPOT_HOSTNAME/g' .env		&& 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_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_DOCKER_TAG=latest/SPOT_DOCKER_TAG=$SPOT_DOCKER_TAG/g' .env
	@@ -150,9 +151,10 @@ deploy:spot.eeo.one.backend2:
	&& sed -i 's/localhost:8089/$SPOT_MORTY_HOSTNAME/g' .env		&& sed -i 's/localhost:8089/$SPOT_MORTY_HOSTNAME/g' .env
	&& sed -i 's/proxy01.ecloud.global/proxy02.ecloud.global/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/WIREGUARD_IP=127.0.0.1/WIREGUARD_IP=$WIREGUARD_IP/g' .env
			&& sed -i 's/PATH/staging-spot/g'
	&& sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/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/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env
	&& sed -i 's/INTERNAL_NETWORK_NAME=staging-spot-default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env"		&& sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env"


	deploy:spot.ecloud.global.backend1:		deploy:spot.ecloud.global.backend1:
	@@ -190,10 +192,10 @@ deploy:spot.ecloud.global.backend1:
	&& sed -i 's/localhost:8089/$SPOT_MORTY_HOSTNAME/g' .env		&& sed -i 's/localhost:8089/$SPOT_MORTY_HOSTNAME/g' .env
	&& sed -i 's/proxy01.ecloud.global/proxy01.ecloud.global/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/WIREGUARD_IP=127.0.0.1/WIREGUARD_IP=$WIREGUARD_IP/g' .env
	&& sed -i 's/\/mnt\/repo-base\/staging-spot/$REPO_BASE/g' .env		&& sed -i 's/PATH/production-spot/g'
	&& sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/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/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env
	&& sed -i 's/INTERNAL_NETWORK_NAME=staging-spot-default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env"		&& sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env"

	deploy:spot.ecloud.global.backend2:		deploy:spot.ecloud.global.backend2: