Merge branch 'main' into renovate/ghcr.io-goauthentik-server

docker/arm/docker-compose.yml

@@ -154,7 +154,38 @@ services:
       - 22000:22000/udp
       - 21027:21027/udp
     restart: unless-stopped
+  
+  wiki-db:
+    image: postgres:15-alpine
+    environment:
+      POSTGRES_DB: wiki
+      POSTGRES_PASSWORD: $DB_PASS
+      POSTGRES_USER: wikijs
+    logging:
+      driver: "none"
+    restart: unless-stopped
+    volumes:
+      - db-data:/var/lib/postgresql/data
+    networks:
+      - gitea_main
 
+  wiki:
+    container_name: wiki
+    image: ghcr.io/requarks/wiki:2.5.303
+    depends_on:
+      - wiki-db
+    environment:
+      DB_TYPE: postgres
+      DB_HOST: wiki-db
+      DB_PORT: 5432
+      DB_USER: wikijs
+      DB_PASS: $DB_PASS
+      DB_NAME: wiki
+    restart: unless-stopped
+    ports:
+      - "1234:3000"
+    networks:
+      - gitea_main
 
 networks:
   gitea_main:
@@ -163,3 +194,4 @@ networks:
 volumes:
   linkstack:
   n8n_data:
+  db-data:

docker/arrs/docker-compose.yml

@@ -57,7 +57,7 @@ services:
       - PGID=1000
 
   sonarr:
-    image: ghcr.io/linuxserver/sonarr@sha256:bffa87787eacff9023df4400f521c159566d14b5a280caec8b54196071e6038e
+    image: ghcr.io/linuxserver/sonarr@sha256:0777b308a414000505651059a95af373ded6aba8ce5a40b50d7aad333dc912e2
     container_name: sonarr
     ports:
       - "8989:8989"

terraform/k3s-master.tf

@@ -6,6 +6,7 @@ resource "proxmox_virtual_environment_vm" "K3s-Master" {
     name         = "K3s-Master"
     description  = "Kubernetes master"
     tags         = ["tofu", "ubuntu-22", "auto-homelab-repo", "infrastructure"]
+    started      = false
 
     agent {
       enabled = true # read 'Qemu guest agent' section, change to true only when ready

terraform/k3s-master2.tf

@@ -6,6 +6,7 @@ resource "proxmox_virtual_environment_vm" "K3s-Master2" {
     name         = "K3s-Master2"
     description  = "Kubernetes Master"
     tags         = ["tofu", "ubuntu-22", "auto-homelab-repo", "infrastructure"]
+    started      = false
 
     agent {
       enabled = true # read 'Qemu guest agent' section, change to true only when ready

terraform/k3s-master3.tf

@@ -6,6 +6,7 @@ resource "proxmox_virtual_environment_vm" "K3s-Master3" {
     name         = "K3s-Master3"
     description  = "Kubernetes master"
     tags         = ["tofu", "ubuntu-22", "auto-homelab-repo", "infrastructure"]
+    started      = false
 
     agent {
       enabled = true # read 'Qemu guest agent' section, change to true only when ready

terraform/runner.tf

@@ -2,17 +2,17 @@ resource "proxmox_virtual_environment_vm" "Runner" {
 
     # VM General Settings
     node_name    = "prox"
-    vm_id        = 207
+    vm_id        = 952
     name         = "Runner"
-    description  = "Forgejo Runner"
-    tags         = ["tofu", "ubuntu-22", "auto-homelab-repo", "infrastructure"]
+    description  = "Forgejo Runner for iac"
+    tags         = ["tofu", "ubuntu-22", "iac-repo", "infrastructure"]
 
     agent {
       enabled = true # read 'Qemu guest agent' section, change to true only when ready
     }
 
     clone {
-        vm_id = 8000
+        vm_id = 8100
     }
     
     # VM CPU Settings
@@ -35,7 +35,7 @@ resource "proxmox_virtual_environment_vm" "Runner" {
     # VM Disk Settings
     disk {
         datastore_id = "Fast2Tb"
-        size         = 60
+        size         = 40
         interface    = "scsi0"
     }