Skip to content

Use Terraform's -chdir flag #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
johnboiles wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use Terraform's -chdir flag #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba0da31
Use Terraform's -chdir flag
johnboiles Feb 13, 2024
7198e53
Fix make snapshot
johnboiles Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ SERVER_KEYS_PATH := ~/.dawg-server-keys
SHELL := /bin/bash

TF_DIR := terraform
TF_PLAN := $(TF_DIR)/_terraform.plan
TF_VARS := -var-file=terraform/terraform.tfvars \
TF_PLAN := _terraform.plan
TF_VARS := -var-file=terraform.tfvars \
-var="do_token=$$(cat $(DO_TOKEN_FILE) | tr -d '\n')" \
-var="ydns_credentials=$$(cat $(YDNS_CREDS_FILE) | tr -d '\n')" \
-var="server_private_key=$$(cat $(SERVER_KEYS_PATH) | head -n1 || echo "")" \
Expand All @@ -26,22 +26,22 @@ deps: ## Install dependencies (if using asdf)

.PHONY: init
init: deps ## Terraform init
terraform init $(TF_DIR)
terraform -chdir=$(TF_DIR) init

##@ Infrastructure

.PHONY: plan
plan: init ## Terraform plan
terraform plan $(TF_VARS) -out=$(TF_PLAN) $(TF_DIR)
terraform -chdir=$(TF_DIR) plan $(TF_VARS) -out=$(TF_PLAN)

.PHONY: apply
apply: init ## Terraform apply
terraform apply $(TF_PLAN)
terraform -chdir=$(TF_DIR) apply $(TF_PLAN)
$(MAKE) download-key

.PHONY: destroy
destroy: init ## Terraform destroy
terraform destroy -auto-approve $(TF_VARS) $(TF_DIR)
terraform -chdir=$(TF_DIR) destroy -auto-approve $(TF_VARS)

.PHONY: deploy
deploy: plan apply ## Terraform plan then apply
Expand All @@ -53,7 +53,7 @@ new-client: ## Generate a new client config and write it to ~/Downloads
ifndef name
$(error 'name' is undefined - run with e.g. 'make new-client name=laptop')
endif
ssh root@$$(terraform output ip | tr -d '\n') /usr/local/bin/wg-add-client.sh -e $$(terraform output endpoint) create $(name) > ~/Downloads/wg-$(name).conf
ssh root@$$(terraform -chdir=terraform output ip | tr -d '\n' | tr -d '"') /usr/local/bin/wg-add-client.sh -e $$(terraform -chdir=terraform output endpoint) create $(name) > ~/Downloads/wg-$(name).conf

.PHONY: add-client
add-client: ## Add a client config
Expand All @@ -66,11 +66,11 @@ endif
ifndef key
$(error 'key' is undefined - run with e.g. 'make add-client name=laptop ip=10.0.0.3 key=<public key>')
endif
ssh root@$$(terraform output ip | tr -d '\n') /usr/local/bin/wg-add-client.sh -c $(ip) -k $(key) add $(name)
ssh root@$$(terraform -chdir=terraform output ip | tr -d '\n' | tr -d '"') /usr/local/bin/wg-add-client.sh -c $(ip) -k $(key) add $(name)

##@ Server commands

ip ?= $$(terraform output ip | tr -d '\n')
ip ?= $$(terraform -chdir=terraform output ip | tr -d '\n' | tr -d '"')

.PHONY: status
status: ## Print server status
Expand All @@ -79,24 +79,24 @@ status: ## Print server status

.PHONY: ssh
ssh: ## SSH to the server
ssh root@$$(terraform output ip | tr -d '\n')
ssh root@$$(terraform -chdir=terraform output ip | tr -d '\n' | tr -d '"')

.PHONY: ssh-list
ssh-list: ## List IDs of SSH key in Digital Ocean
doctl -t $(shell cat ~/.digitalocean/token) compute ssh-key list

.PHONY: snapshot
snapshot: ## Snapshot the server
ssh root@$$(terraform output ip | tr -d '\n') doctl -t $$(cat $(DO_TOKEN_FILE) | tr -d '\n') compute droplet-action snapshot $$(terraform output droplet_id | tr -d '\n') --snapshot-name dawg
ssh root@$$(terraform -chdir=terraform output ip | tr -d '\n' | tr -d '"') doctl -t $$(cat $(DO_TOKEN_FILE) | tr -d '\n') compute droplet-action snapshot $$(terraform -chdir=terraform output droplet_id | tr -d '\n') --snapshot-name dawg

.PHONY: download-key
download-key: ## Download the server's private keys and store locally
set -eo pipefail ;\
if [[ -f $(SERVER_KEYS_PATH) ]]; then \
echo Private keys already exists at $(SERVER_KEYS_PATH) ;\
else \
ssh root@$$(terraform output ip | tr -d '\n') cat /etc/wireguard/server_private.key > $(SERVER_KEYS_PATH) && \
ssh root@$$(terraform output ip | tr -d '\n') cat /etc/wireguard/server_preshared.key >> $(SERVER_KEYS_PATH) && \
ssh root@$$(terraform -chdir=terraform output ip | tr -d '\n' | tr -d '"') cat /etc/wireguard/server_private.key > $(SERVER_KEYS_PATH) && \
ssh root@$$(terraform -chdir=terraform output ip | tr -d '\n' | tr -d '"') cat /etc/wireguard/server_preshared.key >> $(SERVER_KEYS_PATH) && \
echo Private keys downloaded to $(SERVER_KEYS_PATH) ;\
fi

Expand Down
2 changes: 1 addition & 1 deletion terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ resource "null_resource" "server_ready" {
provisioner "local-exec" {
command = <<EOF
set -x
pushd ..
while :
do
make status ip=${digitalocean_droplet.wg.ipv4_address}
Expand All @@ -60,7 +61,6 @@ resource "null_resource" "update_ydns" {
type = "ssh"
user = "root"
host = digitalocean_droplet.wg.ipv4_address
private_key = file("~/.ssh/id_rsa")

@johnboiles johnboiles Feb 13, 2024

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I stuck this in because

  • This is the default anyways
  • Not including this will allow terraform to use your ssh-agent to use passphrase-protected keys

}

provisioner "remote-exec" {
Expand Down
1 change: 0 additions & 1 deletion terraform/modules/client/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ resource "null_resource" "client" {
type = "ssh"
user = "root"
host = var.server_ip
private_key = file("~/.ssh/id_rsa")
}

provisioner "remote-exec" {
Expand Down