Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Mafyuh/iac
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: aebd8321bfbad2e59f36b82960b4b2d0c3f7e4cb
Choose a base ref
..
head repository: Mafyuh/iac
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fdec4c41d98613efe1b4105e88945e22edd3c879
Choose a head ref
Showing with 30 additions and 0 deletions.
  1. +27 −0 docker/arm/docker-compose.yml
  2. +1 −0 terraform/k3s-master.tf
  3. +1 −0 terraform/k3s-master2.tf
  4. +1 −0 terraform/k3s-master3.tf
27 changes: 27 additions & 0 deletions docker/arm/docker-compose.yml
View file
Original file line number Diff line number Diff line change
@@ -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:
1 change: 1 addition & 0 deletions terraform/k3s-master.tf
View file
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions terraform/k3s-master2.tf
View file
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions terraform/k3s-master3.tf
View file
Original file line number Diff line number Diff line change
@@ -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