From 46b4a5193587cb3bbb90f6103a668cdc0bbd6379 Mon Sep 17 00:00:00 2001 From: vincent Date: Tue, 13 Feb 2024 20:32:25 +0100 Subject: [PATCH] CI: improve consul stagging switch --- makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/makefile b/makefile index 35ad67b..1e661c2 100644 --- a/makefile +++ b/makefile @@ -15,7 +15,8 @@ vagranup: create-dev: vagranup DNS-stagging make -C ansible deploy_staging - make -C terraform deploy_vault env=stagging + make -C terraform deploy_vault env=staging + VAULT_TOKEN=$(shell cat ~/vaultUnseal/staging/rootkey) python ./script/generate-vault-secret create-dev-base: vagranup DNS-stagging make -C ansible deploy_staging_base @@ -28,9 +29,11 @@ serve: mkdocs serve DNS-stagging: - $(eval dns := $(shell dig oscar-dev.ducamps-dev.eu +short)) - sudo resolvectl dns virbr2 "$(dns)";sudo resolvectl domain virbr2 "~consul" + $(eval dns := $(shell dig oscar-dev.lan.ducamps.dev +short)) + $(eval dns1 := $(shell dig nas-dev.lan.ducamps.dev +short)) + sudo resolvectl dns virbr2 "$(dns)" "$(dns1)";sudo resolvectl domain virbr2 "~consul";sudo systemctl restart systemd-resolved.service DNS-production: - sudo resolvectl dns virbr2 "";sudo resolvectl domain virbr2 "" + sudo resolvectl dns virbr2 "";sudo resolvectl domain virbr2 "";sudo systemctl restart systemd-resolved.service +