il/ilnmors-homelab
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bk node and refactor

Browse Source
This commit is contained in:
il
2026-06-23 10:57:10 +09:00
parent 927b5b4934
commit fe146b25c7
131 changed files with 2310 additions and 920 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ansible/inventory/group_vars/all.yaml
+96 -19
View File
@@ -21,31 +21,62 @@ domain:
services:
crowdsec:
domain: "crowdsec"
domain:
internal: "crowdsec"
ports:
https: "8080"
dependency:
cert: true
bind:
domain: "bind"
domain:
internal: "bind"
ports:
dns: "53"
blocky:
domain: "blocky"
domain:
internal: "blocky"
ports:
https: "443"
dns: "53"
dot: "853"
dependency:
cert: true
kopia:
domain:
internal: "kopia"
ports:
https: "51515"
dependency:
cert: true
postgresql:
domain: "postgresql"
domain:
internal: "postgresql"
ports:
tcp: "5432" # postgresql db connection port
subuid: "100998"
dependency:
cert: true
ldap:
domain: "ldap"
domain:
internal: "ldap"
ports:
http: "17170"
ldaps: "6360"
subuid: "100999"
dependency:
cert: true
web: "infra-internal"
db: "postgresql"
mail:
domain:
internal: "mail"
ports: ""
subuid: ""
dependency:
cert: true
ca:
domain: "ca"
domain:
internal: "ca"
ports:
https: "9000"
subuid: "100999"
@@ -54,36 +85,43 @@ services:
http: "9793"
subuid: "165533"
prometheus:
domain: "prometheus"
domain:
internal: "prometheus"
ports:
https: "9090"
subuid: "165533"
dependency:
cert: true
web: "infra-internal"
loki:
domain: "loki"
domain:
internal: "loki"
ports:
https: "3100"
subuid: "110000"
dependency:
cert: true
grafana:
domain: "grafana"
domain:
internal: "grafana"
ports:
http: "3000"
subuid: "100471"
dependency:
web: "infra-internal"
db: "postgresql"
caddy:
ports:
http: "2080"
https: "2443"
nas:
domain: "nas"
ports:
https: "5001"
kopia:
domain: "nas"
ports:
https: "51515"
authelia:
domain: "authelia"
domain:
public: "authelia"
ports:
http: "9091"
dependency:
web: "auth-public"
db: "postgresql"
redis:
subuid: "100998"
vaultwarden:
@@ -92,6 +130,9 @@ services:
internal: "vault.app"
ports:
http: "8000"
dependency:
web: "app-public"
db: "postgresql"
gitea:
domain:
public: "gitea"
@@ -99,6 +140,9 @@ services:
ports:
http: "3001"
subuid: "100999"
dependency:
web: "app-public"
db: "postgresql"
immich:
domain:
public: "immich"
@@ -106,6 +150,9 @@ services:
ports:
http: "2283"
redis: "6379"
dependency:
web: "app-public"
db: "postgresql"
immich-ml:
ports:
http: "3003"
@@ -117,6 +164,9 @@ services:
http: "8001"
redis: "6380"
subuid: "100999"
dependency:
web: "app-public"
db: "postgresql"
nextcloud:
domain:
public: "nextcloud"
@@ -125,6 +175,9 @@ services:
http: "8002"
redis: "6382"
subuid: "100032"
dependency:
web: "app-public"
db: "postgresql"
collabora:
domain:
public: "collabora"
@@ -132,6 +185,8 @@ services:
ports:
http: "9980"
subuid: "101000"
dependency:
web: "app-public"
sure:
domain:
public: "sure"
@@ -140,6 +195,9 @@ services:
http: "3002"
redis: "6383"
subuid: "100999"
dependency:
web: "app-public"
db: "postgresql"
outline:
domain:
public: "outline"
@@ -148,6 +206,9 @@ services:
http: "3004"
redis: "6384"
subuid: "101000"
dependency:
web: "app-public"
db: "postgresql"
memos:
domain:
public: "memos"
@@ -155,6 +216,9 @@ services:
ports:
http: "3005"
subuid: "110000"
dependency:
web: "app-public"
db: "postgresql"
mealie:
domain:
public: "mealie"
@@ -162,6 +226,18 @@ services:
ports:
http: "9001"
subuid: "100910"
dependency:
web: "app-public"
db: "postgresql"
homebox:
domain:
public: "homebox"
internal: "homebox.app"
ports:
http: "7745"
dependency:
web: "app-public"
db: "postgresql"
version:
packages:
@@ -194,8 +270,9 @@ version:
immich: "v2.7.5"
paperless: "2.20.15"
nextcloud: "33.0.5"
collabora: "25.04.10.3.1"
collabora: "26.04.1.4.1"
sure: "0.7.1"
outline: "1.8.1"
memos: "0.29.1"
mealie: "v3.19.2"
homebox: "0.26.2"
ansible/inventory/group_vars/hypervisor.yaml
+36 -9
View File
@@ -21,13 +21,40 @@ hardware:
bus: "0x00"
slot: "0x02"
function: "0x0"
hdd:
disk:
data:
hdd0: "WMC6N0E617S8"
hdd1: "P6HVTL0W"
hdd2: "P2GH354H"
hdd3: "P6GJKSMP"
btrfs:
label: "DATA"
level: "raid10"
mount_point: "{{ node['libvirt_path'] }}/data"
serials:
- "WMC6N0E617S8"
- "P6HVTL0W"
- "P2GH354H"
- "P6GJKSMP"
fs:
type: "btrfs"
label: "DATA"
mount_point: "{{ node['libvirt_path'] }}/disk/data"
mount_opts:
- "defaults"
- "noatime"
- "nodatacow"
- "degraded"
- "nofail"
btrfs:
data_profile: "raid10"
metadata_profile: "raid10"
min_devices: 4
backup:
serials:
- "6261S5G4S75H"
fs:
type: "btrfs"
label: "BACKUP"
mount_point: "{{ node['libvirt_path'] }}/disk/backup"
mount_opts:
- "defaults"
- "noatime"
- "nodatacow"
- "nofail"
btrfs:
data_profile: "single"
metadata_profile: "dup"
min_devices: 1
ansible/inventory/host_vars/app.yaml
+1 -10
View File
@@ -24,17 +24,8 @@ vm:
storage: 256
data_storage:
name: "vdb"
pool: "data"
size: 3.5
lan_mac: "0a:49:6e:4d:03:00"
lan_net: "lan-net"
lan_group: "vlan10-access"
# PCIe passthrough address
# result of `lspci | grep -i -e "sata controller" -e "vga"` and parse it.
# Ex) 04:00.0 > domain: "0x0000", bus: "0x04", slot: "0x00", function: "0x0"
pass_through:
igpu:
address: "0000:00:02.0"
domain: "0x0000"
bus: "0x00"
slot: "0x02"
function: "0x0"
ansible/inventory/host_vars/auth.yaml
+4 -4
View File
@@ -12,12 +12,12 @@ vm:
name: "auth"
cpu: 2
cpu_pin: |
<vcpupin vcpu='0' cpuset='8'/>
<vcpupin vcpu='1' cpuset='9'/>
<emulatorpin cpuset='8-9'/>
<vcpupin vcpu='0' cpuset='6'/>
<vcpupin vcpu='1' cpuset='7'/>
<emulatorpin cpuset='6-7'/>
shares: 1024
memory: 2
storage: 64
storage: 32
lan_mac: "0a:49:6e:4d:02:00"
lan_net: "lan-net"
lan_group: "vlan10-access"
ansible/inventory/host_vars/bk.yaml
+27
View File
@@ -0,0 +1,27 @@
---
# Node Factors
node:
name: "bk"
group: "svadmins"
uid: 2009
home_path: "/home/bk"
ssh_san: "{{ node['name'] }},{{ node['name'] }}.{{ domain['internal'] }}"
local_san: "localhost {{ node['name'] }}.{{ domain['internal'] }}"
# VM Factors
vm:
name: "bk"
cpu: 2
cpu_pin: |
<vcpupin vcpu='0' cpuset='6'/>
<vcpupin vcpu='1' cpuset='7'/>
<emulatorpin cpuset='6-7'/>
shares: 512
memory: 2
storage: 32
data_storage:
name: "vdb"
pool: "backup"
size: 3.5
lan_mac: "0a:49:6e:4d:09:00"
lan_net: "lan-net"
lan_group: "vlan10-access"
ansible/inventory/host_vars/console.yaml
+1 -1
View File
@@ -21,6 +21,6 @@ node:
data_path: "{{ node['homelab_path'] }}/data"
config_path: "{{ node['homelab_path'] }}/config"
ssh_san: "{{ node['name'] }},{{ node['name'] }}.{{ domain['internal'] }}"
ssh_users: "vmm,fw,infra,auth,app"
ssh_users: "vmm,fw,bk,infra,auth,app"
# add the hostname of wsl, it is needed to improve the sudo problem
local_san: "localhost {{ node['name'] }} {{ node['name'] }}.{{ domain['internal'] }}"
ansible/inventory/host_vars/fw.yaml
+4 -8
View File
@@ -52,6 +52,8 @@ network4:
vmm:
client: "192.168.1.10"
server: "192.168.10.10"
bk:
server: "192.168.10.9"
infra:
server: "192.168.10.11"
auth:
@@ -60,8 +62,6 @@ network4:
server: "192.168.10.13"
switch:
client: "192.168.1.2"
nas:
client: "192.168.1.11"
printer:
client: "192.168.1.101"
@@ -85,18 +85,14 @@ network6:
vmm:
client: "fd00:1::10"
server: "fd00:10::10"
bk:
server: "fd00:10::9"
infra:
server: "fd00:10::11"
auth:
server: "fd00:10::12"
app:
server: "fd00:10::13"
switch:
client: "fd00:1::2"
nas:
client: "fd00:1::11"
printer:
client: "fd00:1::101"
# Suricata Factors
# suricata_home_net: '[10.0.0.0/8,172.16.0.0/12,192.168.0.0/16]'
ansible/inventory/host_vars/infra.yaml
+4 -4
View File
@@ -15,11 +15,11 @@ vm:
cpu_pin: |
<vcpupin vcpu='0' cpuset='2'/>
<vcpupin vcpu='1' cpuset='3'/>
<vcpupin vcpu='2' cpuset='6'/>
<vcpupin vcpu='3' cpuset='7'/>
<emulatorpin cpuset='6-7'/>
<vcpupin vcpu='2' cpuset='8'/>
<vcpupin vcpu='3' cpuset='9'/>
<emulatorpin cpuset='8-9'/>
shares: 2048
memory: 6
memory: 4
storage: 256
lan_mac: "0a:49:6e:4d:01:00"
lan_net: "lan-net"
ansible/inventory/hosts.ini
+1
View File
@@ -9,6 +9,7 @@ vmm ansible_host=vmm.ilnmors.internal ansible_user=vmm
# --- Virtual Machines ---
[vms]
fw ansible_host=fw.ilnmors.internal ansible_user=fw
bk ansible_host=bk.ilnmors.internal ansible_user=bk
infra ansible_host=infra.ilnmors.internal ansible_user=infra
auth ansible_host=auth.ilnmors.internal ansible_user=auth
app ansible_host=app.ilnmors.internal ansible_user=app