.gitea/workflows/staging.yml aktualisiert

.gitea/workflows/staging.yml

@@ -3,7 +3,7 @@ name: Deploy Staging
 on:
   push:
     branches:
-      - main
+      - "dev*"
 
 jobs:
   staging:
@@ -14,6 +14,11 @@ jobs:
         with:
           submodules: true
 
+      - name: Delete alte Staging VM (CT 200)
+        run: |
+          pct destroy 200 --force || true
+          sleep 3
+
       - name: Terraform Init & Apply (Staging LXC erstellen)
         working-directory: terraform
         run: |
@@ -26,24 +31,13 @@ jobs:
             -var="lxc_bridge=vmbr2" \
             -var="staging_ip=${{ secrets.STAGING_IP }}" \
             -var="staging_gw=${{ secrets.STAGING_GW }}" \
-            -var="ssh_public_key=${{ secrets.DEPLOY_SSH_PUBKEY }}" \
+            -var="root_password=${{ secrets.ROOT_PASSWORD }}"
-            -var="ssh_private_key=${{ secrets.DEPLOY_SSH_KEY }}"
         env:
           TF_IN_AUTOMATION: "true"
 
-      - name: Warte auf LXC Boot
-        run: sleep 30
-
-      - name: SSH Key Setup
-        run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.DEPLOY_SSH_KEY }}" | base64 -d > ~/.ssh/staging_key
-          chmod 600 ~/.ssh/staging_key
-          ssh-keyscan -H ${{ secrets.STAGING_IP }} >> ~/.ssh/known_hosts 2>/dev/null || true
-
       - name: Hugo Clone & Build auf Staging-LXC
         run: |
-          ssh -i ~/.ssh/staging_key -o StrictHostKeyChecking=no deploy@${{ secrets.STAGING_IP }} bash << 'EOF'
+          ssh -i ~/.ssh/deploy_key -o StrictHostKeyChecking=no root@${{ secrets.STAGING_IP }} bash << 'EOF'
           set -e
           cd /tmp
 

hugo/content/_index.md

@@ -0,0 +1 @@
+Test Deploy

terraform/main.tf

@@ -14,58 +14,56 @@ provider "proxmox" {
   pm_tls_insecure     = true
 }
 
-resource "proxmox_lxc" "staging" {
+# Create staging LXC mit pct-Befehl
-  target_node  = var.proxmox_node
+resource "null_resource" "staging_lxc" {
-  hostname     = "hugo-staging"
+  # SSH Public Key in Datei schreiben
-  vmid         = 200
+  provisioner "local-exec" {
-  ostemplate   = var.lxc_ostemplate
+    command = "mkdir -p /tmp/terraform && echo '${var.ssh_public_key}' > /tmp/terraform/staging_key.pub"
-  unprivileged = true
-  start        = true
-  onboot       = false
-
-  cores  = 2
-  memory = 1024
-  swap   = 512
-
-  rootfs {
-    storage = var.lxc_storage
-    size    = "10G"
   }
 
-  network {
+  provisioner "local-exec" {
-    name   = "eth0"
+    command = <<-EOT
-    bridge = var.lxc_bridge
+      pct create 200 \
-    ip     = "${var.staging_ip}/24"
+        ${var.lxc_ostemplate} \
-    gw     = var.staging_gw
+        --hostname hugo-staging \
+        --cores ${var.lxc_cores} \
+        --memory ${var.lxc_memory} \
+        --swap ${var.lxc_swap} \
+        --rootfs ${var.lxc_rootfs} \
+        --net0 name=eth0,bridge=${var.lxc_bridge},ip=${var.staging_ip}/24,gw=${var.staging_gw} \
+        --unprivileged 1 \
+        --start 1 \
+        --password "${var.root_password}" \
+        --ssh-public-keys /tmp/terraform/staging_key.pub
+    EOT
   }
 
-  ssh_public_keys = var.ssh_public_key
+  provisioner "local-exec" {
+    command = "sleep 30"
+  }
 
+  # Setup via SSH (nutzt ~/.ssh/deploy vom Proxmox Host)
   provisioner "remote-exec" {
     inline = [
       "apt-get update -qq",
       "apt-get install -y hugo nginx git rsync curl",
       "systemctl enable --now nginx",
-      "useradd -m -s /bin/bash deploy || true",
+      "useradd -m -s /bin/bash deploy 2>/dev/null || true",
-      "mkdir -p /home/deploy/.ssh",
-      "chmod 700 /home/deploy/.ssh",
-      "echo '${var.ssh_public_key}' >> /home/deploy/.ssh/authorized_keys",
-      "chmod 600 /home/deploy/.ssh/authorized_keys",
-      "chown -R deploy:deploy /home/deploy/.ssh",
       "mkdir -p /var/www/html",
-      "chown -R deploy:deploy /var/www/html"
+      "chown -R deploy:deploy /var/www/html",
+      "echo '✅ Staging VM Setup complete!'"
     ]
+
     connection {
       type        = "ssh"
       user        = "root"
-      private_key = var.ssh_private_key
+      private_key = file(pathexpand("~/.ssh/deploy_key"))
-      host        = self.network[0].ip
+      host        = var.staging_ip
+      timeout     = "5m"
     }
   }
-
-  depends_on = []
 }
 
 output "staging_ip" {
-  value = proxmox_lxc.staging.network[0].ip
+  value = "${var.staging_ip}/24"
 }

terraform/terraform.tfvars.example

@@ -2,7 +2,7 @@ proxmox_host         = "https://192.168.1.10:8006/api2/json"
 proxmox_token_id     = "terraform@pve!deploy"
 proxmox_token_secret = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
 proxmox_node         = "pve"
-lxc_ostemplate       = "local:vztmpl/debian-12-standard_12.7-1_amd64.tar.zst"
+lxc_ostemplate       = "local:vztmpl/debian-13-standard_13.1-2_amd64.tar.zst"
 lxc_storage          = "local-lvm"
 staging_ip           = "192.168.1.50/24"
 staging_gw           = "192.168.1.1"

terraform/variables.tf

@@ -27,7 +27,7 @@ variable "lxc_bridge" {
 variable "lxc_ostemplate" {
   description = "Pfad zum LXC-Template"
   type        = string
-  default     = "local:vztmpl/debian-12-standard_12.7-1_amd64.tar.zst"
+  default     = "local:vztmpl/debian-12-standard_12.12-1_amd64.tar.zst"
 }
 
 variable "lxc_storage" {
@@ -58,3 +58,25 @@ variable "ssh_private_key" {
   type        = string
   sensitive   = true
 }
+
+variable "root_password" {
+  description = "Root Password für Staging VM"
+  type        = string
+  sensitive   = true
+}
+
+variable "lxc_cores" {
+  default = 2
+}
+
+variable "lxc_memory" {
+  default = 1024
+}
+
+variable "lxc_swap" {
+  default = 512
+}
+
+variable "lxc_rootfs" {
+  default = "SSD:10"
+}