From ba3fe8e7ff2b5bedad14ba15a082e785d56b6206 Mon Sep 17 00:00:00 2001 From: MichaelFisher1997 Date: Fri, 18 Apr 2025 11:01:55 +0100 Subject: [PATCH] terraform apply --- .gitea/workflows/terraform-apply.yml | 4 ++-- .gitea/workflows/terraform-plan.yml | 4 ++-- terraform/variables.tf | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/terraform-apply.yml b/.gitea/workflows/terraform-apply.yml index 44d41a8..15cd552 100644 --- a/.gitea/workflows/terraform-apply.yml +++ b/.gitea/workflows/terraform-apply.yml @@ -16,9 +16,8 @@ jobs: pull-requests: write env: - TF_VAR_SSH_KEY: ${{ secrets.SSH_KEY }} + TF_VAR_SSH_KEY_PUBLIC: ${{ secrets.SSH_KEY_PUBLIC }} TF_VAR_TS_AUTHKEY: ${{ secrets.TAILSCALE_KEY }} - TF_VAR_ssh_key: ${{ secrets.SSH_PUBLIC_KEY }} steps: - name: Checkout repository @@ -33,6 +32,7 @@ jobs: working-directory: terraform run: | echo 'proxmox_password = "${{ secrets.PROXMOX_PASSWORD }}"' >> terraform.tfvars + echo 'SSH_KEY_PUBLIC = "${{ secrets.SSH_KEY_PUBLIC }}"' >> terraform.tfvars - name: Terraform Init working-directory: terraform diff --git a/.gitea/workflows/terraform-plan.yml b/.gitea/workflows/terraform-plan.yml index 04f0cbe..67dab5d 100644 --- a/.gitea/workflows/terraform-plan.yml +++ b/.gitea/workflows/terraform-plan.yml @@ -17,9 +17,8 @@ jobs: pull-requests: write env: - TF_VAR_SSH_KEY: ${{ secrets.SSH_KEY }} + TF_VAR_SSH_KEY: ${{ secrets.SSH_KEY_PUBLIC }} TF_VAR_TS_AUTHKEY: ${{ secrets.TAILSCALE_KEY }} - # TF_VAR_ssh_key: ${{ secrets.SSH_PUBLIC_KEY }} steps: - name: Checkout repository @@ -34,6 +33,7 @@ jobs: working-directory: terraform run: | echo 'proxmox_password = "${{ secrets.PROXMOX_PASSWORD }}"' >> terraform.tfvars + echo 'SSH_KEY_PUBLIC = "${{ secrets.SSH_KEY_PUBLIC }}"' >> terraform.tfvars - name: Terraform Init working-directory: terraform diff --git a/terraform/variables.tf b/terraform/variables.tf index 92a6b6f..ef6f40a 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -79,7 +79,7 @@ variable "TS_AUTHKEY" { description = "Tailscale auth key used in cloud-init" } -variable "SSK_KEY_PUB" { +variable "SSK_KEY_PUBLIC" { type = string description = "My Public SSH key fo ssh auth list" }