clean up repo

2025-06-12 12:26:59 +02:00 · 2025-06-12 12:26:59 +02:00 · e4c810dea7
commit e4c810dea7
parent 557eb6ebd3
9 changed files with 32 additions and 50 deletions
--- a/.gitignore
+++ b/.gitignore
@ -37,3 +37,4 @@ conf.img
 .DS_Store

 .idea
+keys/*
--- a/.terraform.lock.hcl
+++ b/.terraform.lock.hcl
@ -1,25 +1,6 @@
 # This file is maintained automatically by "terraform init".
 # Manual edits may be lost in future updates.

-provider "registry.terraform.io/hashicorp/random" {
-  version = "3.7.2"
-  hashes = [
-    "h1:KG4NuIBl1mRWU0KD/BGfCi1YN/j3F7H4YgeeM7iSdNs=",
-    "zh:14829603a32e4bc4d05062f059e545a91e27ff033756b48afbae6b3c835f508f",
-    "zh:1527fb07d9fea400d70e9e6eb4a2b918d5060d604749b6f1c361518e7da546dc",
-    "zh:1e86bcd7ebec85ba336b423ba1db046aeaa3c0e5f921039b3f1a6fc2f978feab",
-    "zh:24536dec8bde66753f4b4030b8f3ef43c196d69cccbea1c382d01b222478c7a3",
-    "zh:29f1786486759fad9b0ce4fdfbbfece9343ad47cd50119045075e05afe49d212",
-    "zh:4d701e978c2dd8604ba1ce962b047607701e65c078cb22e97171513e9e57491f",
-    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
-    "zh:7b8434212eef0f8c83f5a90c6d76feaf850f6502b61b53c329e85b3b281cba34",
-    "zh:ac8a23c212258b7976e1621275e3af7099e7e4a3d4478cf8d5d2a27f3bc3e967",
-    "zh:b516ca74431f3df4c6cf90ddcdb4042c626e026317a33c53f0b445a3d93b720d",
-    "zh:dc76e4326aec2490c1600d6871a95e78f9050f9ce427c71707ea412a2f2f1a62",
-    "zh:eac7b63e86c749c7d48f527671c7aee5b4e26c10be6ad7232d6860167f99dbb0",
-  ]
-}
-
 provider "registry.terraform.io/stackitcloud/stackit" {
  version     = "0.55.0"
  constraints = "0.55.0"
--- a/00-provider.tf
+++ b/00-provider.tf
@ -18,8 +18,7 @@ terraform {
  }
 }

-# Configure the STACKIT Provider
 provider "stackit" {
-  default_region        = "eu01"
-  service_account_token = var.STACKIT_SERVICE_ACCOUNT_TOKEN
+  default_region           = var.stackit_region
+  service_account_key_path = var.stackit_service_account_key_path
 }
--- a/01-config.tf
+++ b/01-config.tf
@ -1,12 +1,17 @@
-# STACKIT Service Account Token
-variable "STACKIT_SERVICE_ACCOUNT_TOKEN" {
+variable "stackit_project_id" {
  type    = string
-  description = ""
+  /*default = "XXXXX-XXXX-XXXX-XXXX-XXXXXXX"*/
+  default = "d75e6aab-b616-4b42-ae3b-aaf161ad626d"
 }

-variable "STACKIT_PROJECT_ID" {
+variable "stackit_region" {
  type    = string
-  description = ""
+  default = "eu01"
+}
+
+variable "stackit_service_account_key_path" {
+  type    = string
+  default = "./keys/stackit-sa.json"
 }

 variable "debian_image" {
--- a/03-network.tf
+++ b/03-network.tf
@ -1,6 +1,6 @@
 # Create vNET Network
 resource "stackit_network" "default" {
-  project_id       = var.STACKIT_PROJECT_ID
+  project_id       = var.stackit_project_id
  ipv4_prefix      = "10.1.2.0/24"
  name             = "default"
  ipv4_nameservers = ["9.9.9.9", "1.1.1.1"]
@ -8,12 +8,12 @@ resource "stackit_network" "default" {

 # Security Group
 resource "stackit_security_group" "active-passive" {
-  project_id = var.STACKIT_PROJECT_ID
+  project_id = var.stackit_project_id
  name       = "ha-active-passive"
 }

 resource "stackit_security_group_rule" "icmp" {
-  project_id        = var.STACKIT_PROJECT_ID
+  project_id        = var.stackit_project_id
  security_group_id = stackit_security_group.active-passive.security_group_id
  direction         = "ingress"
  icmp_parameters = {
@ -26,7 +26,7 @@ resource "stackit_security_group_rule" "icmp" {
 }

 resource "stackit_security_group_rule" "ssh" {
-  project_id        = var.STACKIT_PROJECT_ID
+  project_id        = var.stackit_project_id
  security_group_id = stackit_security_group.active-passive.security_group_id
  direction         = "ingress"
  port_range = {
@ -39,7 +39,7 @@ resource "stackit_security_group_rule" "ssh" {
 }

 resource "stackit_security_group_rule" "http" {
-  project_id        = var.STACKIT_PROJECT_ID
+  project_id        = var.stackit_project_id
  security_group_id = stackit_security_group.active-passive.security_group_id
  direction         = "ingress"
  port_range = {
@ -52,7 +52,7 @@ resource "stackit_security_group_rule" "http" {
 }

 resource "stackit_security_group_rule" "vrrp" {
-  project_id        = var.STACKIT_PROJECT_ID
+  project_id        = var.stackit_project_id
  security_group_id = stackit_security_group.active-passive.security_group_id
  direction         = "ingress"
  protocol = {
--- a/04-master.tf
+++ b/04-master.tf
@ -1,6 +1,6 @@
 # Create virtual Server
 resource "stackit_server" "example01" {
-  project_id = var.STACKIT_PROJECT_ID
+  project_id = var.stackit_project_id
  name       = "example01"
  boot_volume = {
    size                  = 64
@ -16,20 +16,20 @@ resource "stackit_server" "example01" {
 }

 resource "stackit_network_interface" "example01" {
-  project_id         = var.STACKIT_PROJECT_ID
+  project_id         = var.stackit_project_id
  network_id         = stackit_network.default.network_id
  allowed_addresses  = [format("%s/%s", stackit_network_interface.vip01.ipv4, "32")]
  security_group_ids = [stackit_security_group.active-passive.security_group_id]
 }

 resource "stackit_server_network_interface_attach" "example01-nic-attachment" {
-  project_id           = var.STACKIT_PROJECT_ID
+  project_id           = var.stackit_project_id
  server_id            = stackit_server.example01.server_id
  network_interface_id = stackit_network_interface.example01.network_interface_id
 }

 resource "stackit_public_ip" "example01-wan" {
-  project_id           = var.STACKIT_PROJECT_ID
+  project_id           = var.stackit_project_id
  network_interface_id = stackit_network_interface.example01.network_interface_id
  depends_on           = [stackit_server_network_interface_attach.example01-nic-attachment]
 }
--- a/05-backup.tf
+++ b/05-backup.tf
@ -1,6 +1,6 @@
 # Create virtual Server
 resource "stackit_server" "example02" {
-  project_id = var.STACKIT_PROJECT_ID
+  project_id = var.stackit_project_id
  name       = "example02"
  boot_volume = {
    size                  = 64
@ -16,20 +16,20 @@ resource "stackit_server" "example02" {
 }

 resource "stackit_network_interface" "example02" {
-  project_id         = var.STACKIT_PROJECT_ID
+  project_id         = var.stackit_project_id
  network_id         = stackit_network.default.network_id
  allowed_addresses  = [format("%s/%s", stackit_network_interface.vip01.ipv4, "32")]
  security_group_ids = [stackit_security_group.active-passive.security_group_id]
 }

 resource "stackit_server_network_interface_attach" "example02-nic-attachment" {
-  project_id           = var.STACKIT_PROJECT_ID
+  project_id           = var.stackit_project_id
  server_id            = stackit_server.example02.server_id
  network_interface_id = stackit_network_interface.example02.network_interface_id
 }

 resource "stackit_public_ip" "example02-wan" {
-  project_id           = var.STACKIT_PROJECT_ID
+  project_id           = var.stackit_project_id
  network_interface_id = stackit_network_interface.example02.network_interface_id
  depends_on           = [stackit_server_network_interface_attach.example02-nic-attachment]
 }
--- a/06-ha.tf
+++ b/06-ha.tf
@ -1,10 +1,10 @@
 resource "stackit_network_interface" "vip01" {
-  project_id = var.STACKIT_PROJECT_ID
+  project_id = var.stackit_project_id
  network_id = stackit_network.default.network_id
  security   = false
 }

 resource "stackit_public_ip" "vip01-wan" {
-  project_id           = var.STACKIT_PROJECT_ID
+  project_id           = var.stackit_project_id
  network_interface_id = stackit_network_interface.vip01.network_interface_id
 }
--- a/example.env
+++ b/example.env
@ -1,4 +0,0 @@
-# STACKIT Service Account Token
-export TF_VAR_STACKIT_SERVICE_ACCOUNT_TOKEN=
-# STACKIT ProjectID
-export TF_VAR_STACKIT_PROJECT_ID=