From 2a6bf683ca9eba0e2bbe3b905c33e6a3483a6df8 Mon Sep 17 00:00:00 2001 From: Thomas Hintz Date: Mon, 15 Sep 2025 15:56:55 -0700 Subject: [PATCH] Making ssh key configurable in config dir --- .gitignore | 1 + Makefile | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8a6e84b..4fbdadb 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ app config/apps.config config/production.tfvars +config/ssh-keys restic-env restic-password diff --git a/Makefile b/Makefile index a6e4bfe..633ce33 100644 --- a/Makefile +++ b/Makefile @@ -50,8 +50,9 @@ all-apps/nextcloud/postgres_password \ all-apps/nextcloud/redis_password \ all-apps/nextcloud/nextcloud.env \ restic-env \ -restic-password - cat cl.yaml | docker run --rm --volume /home/tjhintz/.ssh/id_rsa.pub:/pwd/ssh-keys --volume ${PWD}:/pwd --workdir /pwd -i quay.io/coreos/butane:latest -d /pwd > ignition.json +restic-password \ +$(config_dir)ssh-keys + cat cl.yaml | docker run --rm --volume $(config_dir)/ssh-keys:/pwd/ssh-keys --volume ${PWD}:/pwd --workdir /pwd -i quay.io/coreos/butane:latest -d /pwd > ignition.json generated.tfvars: $(apps_config) make-generated.sh ./make-generated.sh $(apps_config) > generated.tfvars