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: 3933eb98735b7dfc6b44823c9e876e902235a9f0
Choose a base ref
..
head repository: Mafyuh/iac
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1a95fc848d2388d698c184c1d16b491b4c940b5d
Choose a head ref
4 changes: 2 additions & 2 deletions docker/arm/docker-compose.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
services:
server:
image: codeberg.org/forgejo/forgejo:8.0.1
image: codeberg.org/forgejo/forgejo:8.0.2
container_name: forgejo
environment:
- USER_UID=1000
@@ -107,7 +107,7 @@ services:
networks:
- gitea_main
n8n:
image: ghcr.io/n8n-io/n8n:1.56.1
image: ghcr.io/n8n-io/n8n:1.57.0
container_name: n8n
ports:
- 5678:5678
12 changes: 6 additions & 6 deletions docker/arrs/docker-compose.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
services:
bazarr:
image: ghcr.io/linuxserver/bazarr@sha256:8573a7d8558d7407ec53c205599d99d9876486621681355d147e9091cd99c58b
image: ghcr.io/linuxserver/bazarr@sha256:aa904c142512b64e98b0abd038bf8b07e1b0e8cf3a14a805cb9ae4df9415b933
container_name: bazarr
ports:
- "6767:6767"
@@ -15,7 +15,7 @@ services:
- PGID=1000

lidarr:
image: ghcr.io/linuxserver/lidarr@sha256:d30f42dc071f77ae833d094083263d38be2dd0ddfff3c234ede29a36673a8603
image: ghcr.io/linuxserver/lidarr@sha256:a77af413426b8509fad2d02f5b89104a5766ee6ebb13497d73993e74f6cfa0a8
container_name: lidarr
ports:
- "8686:8686"
@@ -31,7 +31,7 @@ services:
- PGID=1000

prowlarr:
image: ghcr.io/linuxserver/prowlarr@sha256:c93f075dc5afb74dc7a0a55e90974f81425a5d3c5d293022c5416431f4963ce9
image: ghcr.io/linuxserver/prowlarr@sha256:9dd32e2270d174b07bd33a1f54e2b79e03ad944df62ed93efa08f4a381adc9a1
container_name: prowlarr
ports:
- "9696:9696"
@@ -43,7 +43,7 @@ services:
- PGID=1000

radarr:
image: ghcr.io/linuxserver/radarr@sha256:b034531ff81d3e5e1f9fd70c969746040b40e6484c88981ea5d0dee732c10bc3
image: ghcr.io/linuxserver/radarr@sha256:47acec85a0d92d107096088aebe83d1d0a434def34e5bac317fff18ca28741ae
container_name: radarr
ports:
- "7878:7878"
@@ -72,7 +72,7 @@ services:

homarr:
container_name: homarr
image: ghcr.io/ajnart/homarr:0.15.3
image: ghcr.io/ajnart/homarr:0.15.4
restart: unless-stopped
volumes:
- /docker/appdata/homarr/configs:/app/data/configs
@@ -91,7 +91,7 @@ services:
- AUTH_OIDC_ADMIN_GROUP=${AUTH_OIDC_ADMIN_GROUP}

doplarr:
image: ghcr.io/linuxserver/doplarr@sha256:6959cd770bc89c2eaa61e07b13673051d66e6edae09f4a7e7c7846fdfa4dafc6
image: ghcr.io/linuxserver/doplarr@sha256:85c50e8af09ce227b2c121e1e7d4d9d0ff7f943beea024a9b4e5f3e9ad14a06c
container_name: doplarr
environment:
- PUID=1000
2 changes: 1 addition & 1 deletion docker/cf/docker-compose.yml
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ services:

wallos:
container_name: wallos
image: bellamy/wallos:2.22.1
image: bellamy/wallos:2.23.1
ports:
- "8282:80/tcp"
environment:
2 changes: 1 addition & 1 deletion docker/downloaders/docker-compose.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.9'
services:
sabnzbd:
image: ghcr.io/linuxserver/sabnzbd@sha256:6a8db539588665971f24a42e31ddf2240d7be114c08007dc409aff7638c8edf6
image: ghcr.io/linuxserver/sabnzbd@sha256:223197e9cbb70112244e44ba9660ba7ce1d2128771b8a03ad38e20f85c953583
container_name: sabnzbd
environment:
- PUID=1000
4 changes: 3 additions & 1 deletion docker/jellyfin/docker-compose.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
services:
jellyfin:
image: ghcr.io/linuxserver/jellyfin@sha256:0da2fb716f6e7eaeea082d81418f80c4d2adab9407801629790ef3c2d0b743ab
image: ghcr.io/linuxserver/jellyfin@sha256:266a8e1a6dc8e01270935a358effee2b0711af23e0e5479985a6501ce1978da7
container_name: jellyfin
devices:
- /dev/dri/renderD129:/dev/dri/renderD129
@@ -26,6 +26,8 @@ services:
container_name: makemkv
ports:
- 5800:5800
environment:
- MAKEMKV_KEY=$MAKEMKV_KEY
volumes:
- /docker/appdata/makemkv:/config:rw
- /home/mafyuh/makemkv/storage:/storage:rw
2 changes: 1 addition & 1 deletion docker/kasm/docker-compose.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
services:
kasm:
image: ghcr.io/linuxserver/kasm@sha256:0236fb40d19863d11ab472dc8351db690f1190fac20ea643512318709f22f037
image: ghcr.io/linuxserver/kasm@sha256:0647c0dec5ab0f59978e3b0b04ac795416bdeb59423e79ab2f3cb97b522c0c49
container_name: kasm
privileged: true
environment:
2 changes: 1 addition & 1 deletion docker/netboot/docker-compose.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
services:
netbootxyz:
image: ghcr.io/linuxserver/netbootxyz@sha256:069d4a417d550746264ad9ddd5d3a14b6c3de447934ad3416609f2f760ca2e38
image: ghcr.io/linuxserver/netbootxyz@sha256:707d6aa700c133de0209119636237fd2a431f5a927c62b040c90ba726b831ef7
container_name: netboot
environment:
- PUID=1000
34 changes: 34 additions & 0 deletions docker/portainer/docker-compose.yml
View file
Original file line number Diff line number Diff line change
@@ -11,5 +11,39 @@ services:
- "portainer_data:/data"
restart: always

vikunja:
image: vikunja/vikunja@sha256:c31c7d6cad49038ab8a7d1414845d4c45539b43dd6ddd082bcd148e6fcd7b01c
environment:
VIKUNJA_SERVICE_PUBLICURL: $VIKUNJA_SERVICE_PUBLICURL
VIKUNJA_DATABASE_HOST: db
VIKUNJA_DATABASE_PASSWORD: $VIKUNJA_DATABASE_PASSWORD
VIKUNJA_DATABASE_TYPE: mysql
VIKUNJA_DATABASE_USER: vikunja
VIKUNJA_DATABASE_DATABASE: vikunja
VIKUNJA_SERVICE_JWTSECRET: $VIKUNJA_SERVICE_JWTSECRET
ports:
- 3456:3456
volumes:
- /home/mafyuh/vikunja/files:/app/vikunja/files
depends_on:
db:
condition: service_healthy
restart: unless-stopped
db:
image: mariadb:10
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
environment:
MYSQL_ROOT_PASSWORD: $MYSQL_ROOT_PASSWORD
MYSQL_USER: vikunja
MYSQL_PASSWORD: $MYSQL_PASSWORD
MYSQL_DATABASE: vikunja
volumes:
- /home/mafyuh/vikunja/db:/var/lib/mysql
restart: unless-stopped
healthcheck:
test: ["CMD-SHELL", "mysqladmin ping -h localhost -u $$MYSQL_USER --password=$$MYSQL_PASSWORD"]
interval: 2s
start_period: 30s

volumes:
portainer_data:
91 changes: 91 additions & 0 deletions terraform/NAS.tf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
resource "proxmox_virtual_environment_vm" "TrueNAS" {

node_name = "prox"
vm_id = 100
name = "TrueNAS"
machine = "q35"

# VM General Settings
tags = [
"debian",
"infrastructure",
]

# CPU Settings
cpu {
cores = 6
type = "qemu64"
sockets = 1
units = 1024
architecture = "x86_64"
}

# Memory Settings
memory {
dedicated = 8192
}

# Network Settings
network_device {
bridge = "vmbr0"
model = "virtio"
firewall = true
}

# Operating System Settings
operating_system {
type = "l26"
}

# VGA Settings
vga {
type = "std"
memory = 16
}

# Startup Settings
startup {
order = 1
down_delay = -1
up_delay = -1
}

# Additional Settings
scsi_hardware = "virtio-scsi-pci"
keyboard_layout = "en-us"
on_boot = true
migrate = false
stop_on_destroy = false
reboot = false

# Timeout Settings
timeout_clone = 1800
timeout_create = 1800
timeout_migrate = 1800
timeout_reboot = 1800
timeout_shutdown_vm = 1800
timeout_start_vm = 1800
timeout_stop_vm = 300

lifecycle {
ignore_changes = [
scsi_hardware,
keyboard_layout,
on_boot,
migrate,
stop_on_destroy,
reboot,
vga,
cpu,
timeout_clone,
timeout_create,
timeout_migrate,
timeout_move_disk,
timeout_reboot,
timeout_shutdown_vm,
timeout_start_vm,
timeout_stop_vm,
]
}

}
111 changes: 58 additions & 53 deletions terraform/runner.tf
View file
Original file line number Diff line number Diff line change
@@ -1,65 +1,70 @@
resource "proxmox_virtual_environment_vm" "Runner" {

# VM General Settings
node_name = "prox"
vm_id = 952
name = "Runner"
description = "Forgejo Runner for iac"
tags = ["tofu", "ubuntu-22", "iac-repo", "infrastructure"]
# VM General Settings
node_name = "prox"
vm_id = 952
name = "Runner"
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 = 8100
}

# VM CPU Settings
cpu {
cores = 2
type = "host"
architecture = "x86_64"
}

# VM Memory Settings
memory {
dedicated = 2048
}
agent {
enabled = true
}

# VM Network Settings
network_device {
bridge = "vmbr0"
}
clone {
vm_id = 8100
}

# VM CPU Settings
cpu {
cores = 2
type = "host"
architecture = "x86_64"
flags = []
}

# VM Memory Settings
memory {
dedicated = 2048
}

# VM Disk Settings
disk {
datastore_id = "Fast2Tb"
size = 40
interface = "scsi0"
}
# VM Network Settings
network_device {
bridge = "vmbr0"
model = "virtio"
}

vga {
type = "serial0"
}
# VM Disk Settings
disk {
datastore_id = "Fast2Tb"
size = 40
interface = "scsi0"
file_format = "raw"
path_in_datastore = "vm-952-disk-0"
}

initialization {
ip_config {
ipv4 {
address = "dhcp"
}
}
vga {
type = "serial0"
}

user_account {}
initialization {
ip_config {
ipv4 {
address = "dhcp"
}
}

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
]
}
user_data_file_id = "Slow4tb:snippets/cloud-config.yaml"
}

lifecycle {
ignore_changes = [
initialization[0].user_account,
initialization[0].user_data_file_id,
cpu[0].flags,
disk[0].file_format,
disk[0].path_in_datastore,
]
}

}