From d81f7e8bc8e2a7d0a8d2deafcff2b3f5d0f491bb Mon Sep 17 00:00:00 2001 From: Matt Reeves Date: Thu, 22 Aug 2024 20:53:12 -0400 Subject: [PATCH 1/4] add wikijs --- docker/arm/docker-compose.yml | 27 +++++++++++++++++++++++++++ terraform/k3s-master.tf | 1 + terraform/k3s-master2.tf | 1 + terraform/k3s-master3.tf | 1 + 4 files changed, 30 insertions(+) diff --git a/docker/arm/docker-compose.yml b/docker/arm/docker-compose.yml index e5aa54e..cc30f65 100644 --- a/docker/arm/docker-compose.yml +++ b/docker/arm/docker-compose.yml @@ -154,7 +154,33 @@ 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 + 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: @@ -163,3 +189,4 @@ networks: volumes: linkstack: n8n_data: + db-data: diff --git a/terraform/k3s-master.tf b/terraform/k3s-master.tf index a3a59bb..7229c72 100644 --- a/terraform/k3s-master.tf +++ b/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 diff --git a/terraform/k3s-master2.tf b/terraform/k3s-master2.tf index 64da7eb..2b640df 100644 --- a/terraform/k3s-master2.tf +++ b/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 diff --git a/terraform/k3s-master3.tf b/terraform/k3s-master3.tf index de08861..19eb715 100644 --- a/terraform/k3s-master3.tf +++ b/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 From 8de884195f24baa89942d5a98b1de296f5c05bd7 Mon Sep 17 00:00:00 2001 From: Matt Reeves Date: Thu, 22 Aug 2024 21:13:13 -0400 Subject: [PATCH 2/4] remake runner --- docker/arm/docker-compose.yml | 1 + terraform/runner.tf | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docker/arm/docker-compose.yml b/docker/arm/docker-compose.yml index cc30f65..ff7970d 100644 --- a/docker/arm/docker-compose.yml +++ b/docker/arm/docker-compose.yml @@ -168,6 +168,7 @@ services: - db-data:/var/lib/postgresql/data wiki: + container_name: wiki image: ghcr.io/requarks/wiki:2.5.303 depends_on: - wiki-db diff --git a/terraform/runner.tf b/terraform/runner.tf index 9cab0c9..d3a8646 100644 --- a/terraform/runner.tf +++ b/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" } From 71dc8073f89c534367cc4e175d874c0c695e1b17 Mon Sep 17 00:00:00 2001 From: Matt Reeves Date: Thu, 22 Aug 2024 21:21:25 -0400 Subject: [PATCH 3/4] fix wiki --- docker/arm/docker-compose.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/arm/docker-compose.yml b/docker/arm/docker-compose.yml index ff7970d..8782779 100644 --- a/docker/arm/docker-compose.yml +++ b/docker/arm/docker-compose.yml @@ -166,6 +166,8 @@ services: restart: unless-stopped volumes: - db-data:/var/lib/postgresql/data + networks: + - gitea_main wiki: container_name: wiki @@ -182,6 +184,8 @@ services: restart: unless-stopped ports: - "1234:3000" + networks: + - gitea_main networks: gitea_main: From 62e051e2b561cb15292a1dabe0b6689755b01a98 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 24 Aug 2024 00:01:19 +0000 Subject: [PATCH 4/4] :arrow_up: Update ghcr.io/linuxserver/sonarr Docker digest to 0777b30 --- docker/arrs/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/arrs/docker-compose.yml b/docker/arrs/docker-compose.yml index 80f0753..b8caf4b 100644 --- a/docker/arrs/docker-compose.yml +++ b/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"