diff --git a/docker/AI/docker-compose.yml b/docker/AI/docker-compose.yml
index e45a234a..6029742d 100644
--- a/docker/AI/docker-compose.yml
+++ b/docker/AI/docker-compose.yml
@@ -18,7 +18,7 @@ services:
capabilities: [gpu]
open-webui:
- image: ghcr.io/open-webui/open-webui:0.3.30
+ image: ghcr.io/open-webui/open-webui:0.3.32
container_name: open-webui
restart: unless-stopped
networks:
@@ -51,7 +51,7 @@ services:
- host.docker.internal:host-gateway
searxng:
- image: searxng/searxng@sha256:1edda819c3314775285f53d0dc90f27dbd4af65e70c43426a788bc7798315ff5
+ image: searxng/searxng@sha256:8afd2f3ddc32a001ff965e50b1b50f0c3aa89aa92b9f8746022d9aeb12bbca24
container_name: searxng
networks:
- ai-stack
diff --git a/docker/actual/docker-compose.yml b/docker/actual/docker-compose.yml
index 7b12171f..e2c364fc 100644
--- a/docker/actual/docker-compose.yml
+++ b/docker/actual/docker-compose.yml
@@ -1,7 +1,7 @@
services:
actual_server:
container_name: actual
- image: ghcr.io/actualbudget/actual-server:24.9.0
+ image: ghcr.io/actualbudget/actual-server:24.10.1
ports:
- '5006:5006'
environment:
diff --git a/docker/arm/docker-compose.yml b/docker/arm/docker-compose.yml
index 7da70daa..8716ca32 100644
--- a/docker/arm/docker-compose.yml
+++ b/docker/arm/docker-compose.yml
@@ -133,7 +133,7 @@ services:
networks:
- gitea_main
n8n:
- image: ghcr.io/n8n-io/n8n:1.62.1
+ image: ghcr.io/n8n-io/n8n:1.63.2
container_name: n8n
ports:
- 5678:5678
@@ -187,7 +187,7 @@ services:
- postgres
syncthing:
- image: ghcr.io/linuxserver/syncthing@sha256:0141ef2c1ad754d6c93b92c0aa71648bf8c08b97ed80bf943091ad24332fcbb5
+ image: ghcr.io/linuxserver/syncthing@sha256:605814503be631f59ad34db4d4f79119ffe6f01fd0a8d5736c668e0939f81c47
container_name: syncthing
hostname: ARM #optional
environment:
diff --git a/docker/arrs/docker-compose.yml b/docker/arrs/docker-compose.yml
index 9e77cc61..33f47242 100644
--- a/docker/arrs/docker-compose.yml
+++ b/docker/arrs/docker-compose.yml
@@ -140,7 +140,7 @@ services:
- /data/media/Youtube/downloads:/downloads
syncthing:
- image: ghcr.io/linuxserver/syncthing@sha256:0141ef2c1ad754d6c93b92c0aa71648bf8c08b97ed80bf943091ad24332fcbb5
+ image: ghcr.io/linuxserver/syncthing@sha256:605814503be631f59ad34db4d4f79119ffe6f01fd0a8d5736c668e0939f81c47
container_name: syncthing
hostname: ARRS
environment:
diff --git a/docker/cf/docker-compose.yml b/docker/cf/docker-compose.yml
index 993e3ec8..4df9a2a2 100644
--- a/docker/cf/docker-compose.yml
+++ b/docker/cf/docker-compose.yml
@@ -2,12 +2,12 @@
services:
cf-tunnel:
restart: unless-stopped
- image: cloudflare/cloudflared@sha256:c9206bb54b6eccf534d3ce748dffa9358f1d744f7605ef778383833e7a81a0e9
+ image: cloudflare/cloudflared@sha256:717ee9382965765e3a43e9c03b85daffc6283aa5f29f9c2d905cfd0ece5a3ef1
command: tunnel --no-autoupdate run --token $CF_TOKEN
wallos:
container_name: wallos
- image: bellamy/wallos:2.27.2
+ image: bellamy/wallos:2.29.2
ports:
- "8282:80/tcp"
environment:
diff --git a/docker/jellyfin/docker-compose.yml b/docker/jellyfin/docker-compose.yml
index d52d5936..d95fe015 100644
--- a/docker/jellyfin/docker-compose.yml
+++ b/docker/jellyfin/docker-compose.yml
@@ -1,7 +1,7 @@
---
services:
jellyfin:
- image: ghcr.io/linuxserver/jellyfin@sha256:140fcea8a5d9b9b6534790e8f9289b94030ba603707a5fcb5e47f5df7b625e38
+ image: ghcr.io/linuxserver/jellyfin@sha256:a074e43e90e97cb6a59ca0345bc6908fa3262b459618ae608b9da7e8ac4ae1f2
container_name: jellyfin
devices:
- /dev/dri/renderD129:/dev/dri/renderD129
@@ -37,7 +37,7 @@ services:
privileged: true
syncthing:
- image: ghcr.io/linuxserver/syncthing@sha256:0141ef2c1ad754d6c93b92c0aa71648bf8c08b97ed80bf943091ad24332fcbb5
+ image: ghcr.io/linuxserver/syncthing@sha256:605814503be631f59ad34db4d4f79119ffe6f01fd0a8d5736c668e0939f81c47
container_name: syncthing
hostname: JF
environment:
diff --git a/terraform/AI.tf b/terraform/AI.tf
deleted file mode 100644
index 4d5df5f7..00000000
--- a/terraform/AI.tf
+++ /dev/null
@@ -1,72 +0,0 @@
-resource "proxmox_virtual_environment_vm" "AI" {
-
- # VM General Settings
- node_name = "pve2"
- vm_id = 322
- name = "AI"
- machine = "q35"
- description = "Stable-Diffusion"
- tags = ["tofu", "ubuntu-22", "iac-repo"]
- started = false
-
- agent {
- enabled = true
- }
-
- clone {
- vm_id = 9999
- }
-
- # VM CPU Settings
- cpu {
- cores = 10
- type = "host"
- architecture = "x86_64"
- }
-
- # VM Memory Settings
- memory {
- dedicated = 16384
- }
-
- # VM Network Settings
- network_device {
- bridge = "vmbr0"
- vlan_id = 1
- }
-
- # VM Disk Settings
- disk {
- datastore_id = "local-lvm"
- size = 100
- interface = "scsi0"
- }
-
-
- hostpci {
- device = "hostpci0"
- pcie = true
- mapping = "gpu2"
- rombar = true
- }
-
- initialization {
- ip_config {
- ipv4 {
- address = "dhcp"
- }
- }
-
- user_data_file_id = proxmox_virtual_environment_file.cloud_config2.id
- }
-
- lifecycle {
- ignore_changes = [
- initialization[0].user_account[0].keys,
- initialization[0].user_account[0].password,
- initialization[0].user_account[0].username,
- initialization[0].user_data_file_id
- ]
- }
-
-}
diff --git a/terraform/NAS.tf b/terraform/NAS.tf
index cd05db7c..5f57b3bb 100644
--- a/terraform/NAS.tf
+++ b/terraform/NAS.tf
@@ -10,6 +10,11 @@ resource "proxmox_virtual_environment_vm" "TrueNAS" {
"debian",
"infrastructure",
]
+
+ agent {
+ enabled = true
+ type = "virtio"
+ }
# CPU Settings
cpu {
diff --git a/terraform/kasm.tf b/terraform/kasm.tf
index 7429341f..778e53e5 100644
--- a/terraform/kasm.tf
+++ b/terraform/kasm.tf
@@ -59,18 +59,4 @@ resource "proxmox_virtual_environment_vm" "Kasm" {
initialization[0].user_data_file_id
]
}
-
-provisioner "remote-exec" {
- inline = [
- "cd /home/mafyuh/iac/docker/kasm",
- "git pull",
- "docker compose up -d"
- ]
- connection {
- type = "ssh"
- user = "mafyuh"
- private_key = file("/home/mafyuh/.ssh/id_rsa")
- host = var.kasm_ssh_ip
- }
-}
}
\ No newline at end of file
diff --git a/terraform/provider.tf b/terraform/provider.tf
index a532e63f..e76e1b8b 100644
--- a/terraform/provider.tf
+++ b/terraform/provider.tf
@@ -1,26 +1,46 @@
terraform {
+ required_providers {
+ proxmox = {
+ source = "bpg/proxmox"
+ version = ">= 0.65.0"
+ }
+ }
- required_providers {
- proxmox = {
- source = "bpg/proxmox"
- version = ">= 0.60.1"
- }
+ backend "s3" {
+ bucket = "BigBuckets"
+ region = "us-ashburn-1"
+ key = "tf.tfstate"
+ skip_region_validation = true
+ skip_credentials_validation = true
+ skip_requesting_account_id = true
+ use_path_style = true
+ skip_s3_checksum = true
+ skip_metadata_api_check = true
+ endpoints = {
+ s3 = var.s3_endpoint
}
+ }
}
provider "proxmox" {
- endpoint = var.virtual_environment_endpoint
- password = var.ssh_password
- username = "root@pam"
- insecure = true
-
+ endpoint = var.virtual_environment_endpoint
+ password = var.ssh_password
+ username = "root@pam"
+ insecure = true
+
ssh {
agent = true
- username = "root"
- password = var.ssh_password
+ username = "root"
+ password = var.ssh_password
+
+ node {
+ name = "prox"
+ address = var.prox_ip_address
+ }
+
node {
- name = "prox"
- address = var.prox_ip_address
+ name = "pve2"
+ address = var.pve2_ip_address
}
}
}
diff --git a/terraform/ubuntu22-template.tf b/terraform/ubuntu22-template.tf
index c2df9e85..01cc16d6 100644
--- a/terraform/ubuntu22-template.tf
+++ b/terraform/ubuntu22-template.tf
@@ -37,4 +37,11 @@ vga {
type = "serial0"
}
+cpu {
+ cores = 2
+ type = "host"
+ architecture = "x86_64"
+ }
}
+
+
diff --git a/terraform/ubuntu22-template2.tf b/terraform/ubuntu22-template2.tf
index e7d6f75c..b4efe467 100644
--- a/terraform/ubuntu22-template2.tf
+++ b/terraform/ubuntu22-template2.tf
@@ -37,4 +37,9 @@ vga {
type = "serial0"
}
+cpu {
+ cores = 2
+ type = "host"
+ architecture = "x86_64"
+ }
}
diff --git a/terraform/vars.tf b/terraform/vars.tf
index 94ffacaa..60ca8e46 100644
--- a/terraform/vars.tf
+++ b/terraform/vars.tf
@@ -56,4 +56,12 @@ variable "kasm_ssh_ip" {
variable "ubu_ip_address" {
type = string
+}
+
+variable "pve2_ip_address" {
+ type = string
+}
+
+variable "s3_endpoint" {
+ type = string
}
\ No newline at end of file
diff --git a/terraform/whisper.tf b/terraform/whisper.tf
deleted file mode 100644
index a0a406c3..00000000
--- a/terraform/whisper.tf
+++ /dev/null
@@ -1,76 +0,0 @@
-resource "proxmox_virtual_environment_vm" "Whisper" {
-
- # VM General Settings
- node_name = "prox"
- vm_id = 203
- name = "Whisper"
- machine = "q35"
- description = "Creates subtitles for Bazarr and stable-diffusion"
- tags = ["tofu", "ubuntu-22", "auto-homelab-repo"]
- started = false
-
- agent {
- enabled = true # read 'Qemu guest agent' section, change to true only when ready
- }
-
- clone {
- vm_id = 8000
- }
-
- # VM CPU Settings
- cpu {
- cores = 2
- type = "host"
- architecture = "x86_64"
- }
-
- # VM Memory Settings
- memory {
- dedicated = 4096
- }
-
- # VM Network Settings
- network_device {
- bridge = "vmbr0"
- vlan_id = 1
- }
-
- # VM Disk Settings
- disk {
- datastore_id = "Fast2Tb"
- size = 40
- interface = "scsi0"
- }
-
- vga {
- type = "serial0"
- }
-
- hostpci {
- device = "hostpci0"
- pcie = true
- mapping = "gpu"
- rombar = true
- }
-
- initialization {
- ip_config {
- ipv4 {
- address = var.whisper_ip_address
- gateway = var.vlan_gateway
- }
- }
-
- user_account {}
- }
-
- lifecycle {
- ignore_changes = [
- initialization[0].user_account[0].keys,
- initialization[0].user_account[0].password,
- initialization[0].user_account[0].username,
- initialization[0].user_data_file_id
- ]
- }
-
-}