diff --git a/barbarian/inxi -CDGmMNPS.txt b/barbarian/inxi -CDGmMNPS.txt index fd1fd84..784cc2a 100644 --- a/barbarian/inxi -CDGmMNPS.txt +++ b/barbarian/inxi -CDGmMNPS.txt @@ -1,11 +1,11 @@ System: - Host: barbarian Kernel: 6.6.20-production+truenas arch: x86_64 bits: 64 Console: pty pts/0 + Host: barbarian Kernel: 6.6.29-production+truenas arch: x86_64 bits: 64 Console: pty pts/2 Distro: Debian GNU/Linux 12 (bookworm) Machine: Type: Desktop Mobo: Gigabyte model: X99-SLI-CF v: x.x serial: N/A UEFI: American Megatrends v: F24a date: 01/11/2018 Memory: - System RAM: total: 64 GiB available: 62.65 GiB used: 51.09 GiB (81.6%) + System RAM: total: 64 GiB available: 62.65 GiB used: 12.81 GiB (20.4%) Array-1: capacity: 512 GiB note: check slots: 8 modules: 8 EC: None Device-1: DIMM_A1 type: DDR4 size: 8 GiB speed: 2133 MT/s Device-2: DIMM_A2 type: DDR4 size: 8 GiB speed: 2133 MT/s @@ -17,56 +17,51 @@ Memory: Device-8: DIMM_D2 type: DDR4 size: 8 GiB speed: 2133 MT/s CPU: Info: 6-core model: Intel Core i7-5930K bits: 64 type: MT MCP cache: L2: 1.5 MiB - Speed (MHz): avg: 1391 min/max: 1200/3700 cores: 1: 1200 2: 1200 3: 1200 4: 2300 5: 1200 - 6: 1200 7: 1200 8: 1200 9: 1200 10: 1200 11: 1201 12: 2400 + Speed (MHz): avg: 1316 min/max: 1200/3700 cores: 1: 1200 2: 1200 3: 1200 4: 1200 5: 1200 + 6: 1200 7: 1200 8: 1200 9: 1200 10: 1200 11: 2600 12: 1200 Graphics: Device-1: NVIDIA GK208B [GeForce GT 710] driver: N/A - Display: server: No display server data found. Headless machine? tty: 154x34 + Display: server: No display server data found. Headless machine? tty: 154x70 API: N/A Message: No API data available in console. Headless machine? Network: Device-1: Intel Ethernet I218-V driver: e1000e Device-2: Mellanox MT26448 [ConnectX EN 10GigE PCIe 2.0 5GT/s] driver: mlx4_core Drives: - Local Storage: total: raw: 174.73 TiB usable: 139.09 TiB used: 58.74 TiB (42.2%) - ID-1: /dev/sda vendor: Intel model: SSDSCKGW080A4 size: 74.53 GiB - ID-2: /dev/sdb vendor: Hitachi model: HUH72808CLAR8000 size: 7.28 TiB - ID-3: /dev/sdc vendor: Hitachi model: HUH728080AL5200 size: 7.28 TiB - ID-4: /dev/sdd vendor: Hitachi model: HUH728080AL4200 size: 7.28 TiB + Local Storage: total: raw: 174.73 TiB usable: 139.03 TiB used: 59.12 TiB (42.5%) + ID-1: /dev/sda vendor: Hitachi model: HUH72808CLAR8000 size: 7.28 TiB + ID-2: /dev/sdb vendor: Hitachi model: HUH728080AL4200 size: 7.28 TiB + ID-3: /dev/sdc vendor: Hitachi model: HUH72808CLAR8000 size: 7.28 TiB + ID-4: /dev/sdd vendor: Hitachi model: HUH728080AL5200 size: 7.28 TiB ID-5: /dev/sde vendor: Hitachi model: HUH72808CLAR8000 size: 7.28 TiB - ID-6: /dev/sdf vendor: Hitachi model: HUH72808CLAR8000 size: 7.28 TiB - ID-7: /dev/sdg vendor: Hitachi model: HUH728080AL5200 size: 7.28 TiB + ID-6: /dev/sdf vendor: Hitachi model: HUH728080AL5200 size: 7.28 TiB + ID-7: /dev/sdg vendor: Hitachi model: HUH728080AL4200 size: 7.28 TiB ID-8: /dev/sdh vendor: Hitachi model: HUH72808CLAR8000 size: 7.28 TiB - ID-9: /dev/sdi vendor: Hitachi model: HUH728080AL4200 size: 7.28 TiB + ID-9: /dev/sdi vendor: Hitachi model: HUH728080AL5200 size: 7.28 TiB ID-10: /dev/sdj vendor: Hitachi model: HUH72808CLAR8000 size: 7.28 TiB - ID-11: /dev/sdk vendor: Hitachi model: HUH728080AL5200 size: 7.28 TiB + ID-11: /dev/sdk vendor: Hitachi model: HUH72808CLAR8000 size: 7.28 TiB ID-12: /dev/sdl vendor: Hitachi model: HUH72808CLAR8000 size: 7.28 TiB ID-13: /dev/sdm vendor: Hitachi model: HUH72808CLAR8000 size: 7.28 TiB ID-14: /dev/sdn vendor: Hitachi model: HUH72808CLAR8000 size: 7.28 TiB ID-15: /dev/sdo vendor: Hitachi model: HUH72808CLAR8000 size: 7.28 TiB - ID-16: /dev/sdp vendor: Hitachi model: HUH728080AL4200 size: 7.28 TiB - ID-17: /dev/sdq vendor: Hitachi model: HUH72808CLAR8000 size: 7.28 TiB - ID-18: /dev/sdr vendor: Hitachi model: HUH72808CLAR8000 size: 7.28 TiB - ID-19: /dev/sds vendor: Sun Microsystems model: H7280A520SUN8.0T size: 7.28 TiB - ID-20: /dev/sdt vendor: Hitachi model: HUH728080AL4200 size: 7.28 TiB - ID-21: /dev/sdu vendor: Hitachi model: HUH72808CLAR8000 size: 7.28 TiB + ID-16: /dev/sdp vendor: Hitachi model: HUH72808CLAR8000 size: 7.28 TiB + ID-17: /dev/sdq vendor: Sun Microsystems model: H7280A520SUN8.0T size: 7.28 TiB + ID-18: /dev/sdr vendor: Hitachi model: HUH728080AL4200 size: 7.28 TiB + ID-19: /dev/sds vendor: Hitachi model: HUH728080AL4200 size: 7.28 TiB + ID-20: /dev/sdt vendor: Hitachi model: HUH72808CLAR8000 size: 7.28 TiB + ID-21: /dev/sdu vendor: Sun Microsystems model: H7280A520SUN8.0T size: 7.28 TiB ID-22: /dev/sdv vendor: Sun Microsystems model: H7280A520SUN8.0T size: 7.28 TiB - ID-23: /dev/sdw vendor: Sun Microsystems model: H7280A520SUN8.0T size: 7.28 TiB + ID-23: /dev/sdw vendor: Hitachi model: HUH72808CLAR8000 size: 7.28 TiB ID-24: /dev/sdx vendor: Hitachi model: HUH72808CLAR8000 size: 7.28 TiB - ID-25: /dev/sdy vendor: Hitachi model: HUH72808CLAR8000 size: 7.28 TiB + ID-25: /dev/sdy vendor: Intel model: SSDSCKGW080A4 size: 74.53 GiB Partition: - ID-1: / size: 34.03 GiB used: 163.6 MiB (0.5%) fs: zfs logical: freenas-boot/ROOT/24.04.0 - ID-2: /home size: 33.87 GiB used: 128 KiB (0.0%) fs: zfs - logical: freenas-boot/ROOT/24.04.0/home - ID-3: /opt size: 33.94 GiB used: 72.1 MiB (0.2%) fs: zfs - logical: freenas-boot/ROOT/24.04.0/opt - ID-4: /usr size: 35.76 GiB used: 1.88 GiB (5.3%) fs: zfs - logical: freenas-boot/ROOT/24.04.0/usr - ID-5: /var size: 33.89 GiB used: 22.1 MiB (0.1%) fs: zfs - logical: freenas-boot/ROOT/24.04.0/var - ID-6: /var/log size: 33.97 GiB used: 99.4 MiB (0.3%) fs: zfs - logical: freenas-boot/ROOT/24.04.0/var/log - ID-7: swap-1 size: 2 GiB used: 689.1 MiB (33.7%) fs: swap dev: /dev/dm-0 - ID-8: swap-2 size: 2 GiB used: 298.6 MiB (14.6%) fs: swap dev: /dev/dm-1 - ID-9: swap-3 size: 2 GiB used: 3.6 MiB (0.2%) fs: swap dev: /dev/dm-2 - ID-10: swap-4 size: 15.98 GiB used: 0 KiB (0.0%) fs: swap dev: /dev/dm-3 - ID-11: swap-5 size: 2 GiB used: 0 KiB (0.0%) fs: swap dev: /dev/dm-4 \ No newline at end of file + ID-1: / size: 32.28 GiB used: 163.6 MiB (0.5%) fs: zfs logical: freenas-boot/ROOT/24.04.1.1 + ID-2: /home size: 32.12 GiB used: 128 KiB (0.0%) fs: zfs + logical: freenas-boot/ROOT/24.04.1.1/home + ID-3: /opt size: 32.19 GiB used: 72.1 MiB (0.2%) fs: zfs + logical: freenas-boot/ROOT/24.04.1.1/opt + ID-4: /usr size: 34.01 GiB used: 1.89 GiB (5.6%) fs: zfs + logical: freenas-boot/ROOT/24.04.1.1/usr + ID-5: /var size: 32.14 GiB used: 19.6 MiB (0.1%) fs: zfs + logical: freenas-boot/ROOT/24.04.1.1/var + ID-6: /var/log size: 32.2 GiB used: 88.8 MiB (0.3%) fs: zfs + logical: freenas-boot/ROOT/24.04.1.1/var/log \ No newline at end of file diff --git a/fighter/config/traefik/config/barbarian.yaml b/fighter/config/traefik/config/barbarian.yaml deleted file mode 100644 index 7f025c3..0000000 --- a/fighter/config/traefik/config/barbarian.yaml +++ /dev/null @@ -1,17 +0,0 @@ -http: - routers: - barbarian: - rule: "Host(`nas.jafner.net`)" - entryPoints: "websecure" - middlewares: - - "lan-only@file" - service: "barbarian@file" - tls: - certResolver: "lets-encrypt" - - services: - barbarian: - loadBalancer: - servers: - - url: "http://192.168.1.10/" - \ No newline at end of file diff --git a/fighter/config/traefik/config/monk.yaml b/fighter/config/traefik/config/monk.yaml deleted file mode 100644 index c6e5466..0000000 --- a/fighter/config/traefik/config/monk.yaml +++ /dev/null @@ -1,17 +0,0 @@ -http: - routers: - monk: - rule: "Host(`backup.nas.jafner.net`)" - entryPoints: "websecure" - middlewares: - - "lan-only@file" - service: "monk@file" - tls: - certResolver: "lets-encrypt" - - services: - monk: - loadBalancer: - servers: - - url: "http://192.168.1.11/" - \ No newline at end of file diff --git a/fighter/config/traefik/config/nas.yaml b/fighter/config/traefik/config/nas.yaml new file mode 100644 index 0000000..def1fef --- /dev/null +++ b/fighter/config/traefik/config/nas.yaml @@ -0,0 +1,40 @@ +http: + routers: + barbarian: + rule: "Host(`barbarian.nas.jafner.net`)" + entryPoints: "websecure" + middlewares: + - "lan-only@file" + service: "barbarian@file" + tls: + certResolver: "lets-encrypt" + monk: + rule: "Host(`monk.nas.jafner.net`)" + entryPoints: "websecure" + middlewares: + - "lan-only@file" + service: "monk@file" + tls: + certResolver: "lets-encrypt" + paladin: + rule: "Host(`paladin.nas.jafner.net`)" + entryPoints: "websecure" + middlewares: + - "lan-only@file" + service: "paladin@file" + tls: + certResolver: "lets-encrypt" + + services: + barbarian: + loadBalancer: + servers: + - url: "http://192.168.1.10/" + monk: + loadBalancer: + servers: + - url: "http://192.168.1.11/" + paladin: + loadBalancer: + servers: + - url: "http://192.168.1.12/" \ No newline at end of file diff --git a/monk/inxi -CDGmMNPS.txt b/monk/inxi -CDGmMNPS.txt index ab044a0..8fd61df 100644 --- a/monk/inxi -CDGmMNPS.txt +++ b/monk/inxi -CDGmMNPS.txt @@ -1,11 +1,11 @@ System: - Host: monk Kernel: 5.15.107+truenas arch: x86_64 bits: 64 Console: pty pts/1 Distro: Debian - GNU/Linux 11 (bullseye) + Host: monk Kernel: 6.6.29-production+truenas arch: x86_64 bits: 64 Console: pty pts/0 + Distro: Debian GNU/Linux 12 (bookworm) Machine: Type: Desktop Mobo: Gigabyte model: Z77X-UD5H serial: N/A UEFI: American Megatrends v: F16j date: 11/14/2017 Memory: - System RAM: total: 16 GiB available: 15.51 GiB used: 9.39 GiB (60.5%) igpu: 64 MiB + System RAM: total: 16 GiB available: 15.52 GiB used: 12 GiB (77.3%) igpu: 64 MiB Array-1: capacity: 32 GiB slots: 4 modules: 2 EC: None Device-1: ChannelB-DIMM1 type: no module installed Device-2: ChannelA-DIMM1 type: no module installed @@ -13,22 +13,29 @@ Memory: Device-4: ChannelA-DIMM0 type: DDR3 size: 8 GiB speed: 1600 MT/s CPU: Info: quad core model: Intel Core i5-3570K bits: 64 type: MCP cache: L2: 1024 KiB - Speed (MHz): avg: 1602 min/max: 1600/3800 cores: 1: 1602 2: 1602 3: 1602 4: 1602 + Speed (MHz): avg: 2563 min/max: 1600/3800 cores: 1: 2683 2: 2414 3: 2668 4: 2488 Graphics: - Device-1: Intel Xeon E3-1200 v2/3rd Gen Core processor Graphics driver: i915 v: kernel - Display: server: No display server data found. Headless machine? tty: 169x58 + Device-1: Intel IvyBridge GT2 [HD Graphics 4000] driver: i915 v: kernel + Display: server: No display server data found. Headless machine? tty: 154x70 API: N/A Message: No API data available in console. Headless machine? Network: Device-1: Intel 82579V Gigabit Network driver: e1000e Device-2: Qualcomm Atheros AR8151 v2.0 Gigabit Ethernet driver: atl1c Drives: - Local Storage: total: raw: 29.55 TiB usable: 15.27 TiB used: 9.39 TiB (61.5%) - ID-1: /dev/sda vendor: SanDisk model: SDSSDX480GG25 size: 447.13 GiB - ID-2: /dev/sdb vendor: HGST (Hitachi) model: HUH728080ALE604 size: 7.28 TiB + Local Storage: total: raw: 29.55 TiB usable: 15.27 TiB used: 9.42 TiB (61.7%) + ID-1: /dev/sda vendor: HGST (Hitachi) model: HUH728080ALE604 size: 7.28 TiB + ID-2: /dev/sdb vendor: SanDisk model: SDSSDX480GG25 size: 447.13 GiB ID-3: /dev/sdc vendor: HGST (Hitachi) model: HUH728080ALE604 size: 7.28 TiB ID-4: /dev/sdd vendor: HGST (Hitachi) model: HUH728080ALE604 size: 7.28 TiB ID-5: /dev/sde vendor: HGST (Hitachi) model: HUH728080ALE604 size: 7.28 TiB Partition: - ID-1: / size: 428.75 GiB used: 2.65 GiB (0.6%) fs: zfs logical: boot-pool/ROOT/22.12.3 - ID-2: swap-1 size: 2 GiB used: 66.3 MiB (3.2%) fs: swap dev: /dev/dm-0 - ID-3: swap-2 size: 2 GiB used: 0 KiB (0.0%) fs: swap dev: /dev/dm-1 \ No newline at end of file + ID-1: / size: 418.77 GiB used: 164 MiB (0.0%) fs: zfs logical: boot-pool/ROOT/24.04.1.1 + ID-2: /home size: 418.61 GiB used: 768 KiB (0.0%) fs: zfs + logical: boot-pool/ROOT/24.04.1.1/home + ID-3: /opt size: 418.68 GiB used: 74.1 MiB (0.0%) fs: zfs + logical: boot-pool/ROOT/24.04.1.1/opt + ID-4: /usr size: 420.73 GiB used: 2.12 GiB (0.5%) fs: zfs + logical: boot-pool/ROOT/24.04.1.1/usr + ID-5: /var size: 418.64 GiB used: 32 MiB (0.0%) fs: zfs logical: boot-pool/ROOT/24.04.1.1/var + ID-6: /var/log size: 418.65 GiB used: 43.6 MiB (0.0%) fs: zfs + logical: boot-pool/ROOT/24.04.1.1/var/log \ No newline at end of file diff --git a/paladin/inxi -CDGmMNPS.txt b/paladin/inxi -CDGmMNPS.txt new file mode 100644 index 0000000..45cc021 --- /dev/null +++ b/paladin/inxi -CDGmMNPS.txt @@ -0,0 +1,46 @@ +System: + Host: paladin Kernel: 6.6.32-production+truenas arch: x86_64 bits: 64 + Console: pty pts/0 Distro: Debian GNU/Linux 12 (bookworm) +Machine: + Type: Server Mobo: ASUSTeK model: Z10PA-U8 Series v: Rev 1.xx serial: + UEFI-[Legacy]: American Megatrends v: 0601 date: 06/02/2015 +Memory: + System RAM: total: 128 GiB available: 125.7 GiB used: 3.1 GiB (2.5%) + Message: For most reliable report, use superuser + dmidecode. + Report: arrays: 2 capacity: N/A installed: N/A slots: 8 active: N/A type: N/A + eec: Multi-bit ECC + Array-1: capacity: N/A installed: N/A slots: 4 modules: 0 EC: Multi-bit ECC + Device-1: DIMM_A1 type: no module installed + Device-2: DIMM_A2 type: no module installed + Device-3: DIMM_B1 type: no module installed + Device-4: DIMM_B2 type: no module installed + Array-2: capacity: N/A installed: N/A slots: 4 modules: 0 EC: Multi-bit ECC + Device-1: DIMM_C1 type: no module installed + Device-2: DIMM_C2 type: no module installed + Device-3: DIMM_D1 type: no module installed + Device-4: DIMM_D2 type: no module installed +CPU: + Info: 12-core model: Intel Xeon E5-2680 v3 bits: 64 type: MT MCP cache: L2: 3 MiB + Speed (MHz): avg: 1645 min/max: 1200/3300 cores: 1: 2400 2: 2100 3: 1200 4: 1200 5: 2100 + 6: 1200 7: 1200 8: 1200 9: 1900 10: 3300 11: 1200 12: 2200 13: 2100 14: 1200 15: 1200 16: 1200 + 17: 2100 18: 1200 19: 1200 20: 1200 21: 1200 22: 1200 23: 1200 24: 3300 +Graphics: + Device-1: ASPEED Graphics Family driver: ast v: kernel + Display: server: No display server data found. Headless machine? tty: 154x70 + resolution: 1600x900 + API: N/A Message: No API data available in console. Headless machine? +Network: + Device-1: Intel I210 Gigabit Network driver: igb + Device-2: Intel I210 Gigabit Network driver: igb +Drives: + Local Storage: total: raw: 149.06 GiB usable: 73.19 GiB used: 2.41 GiB (3.3%) + ID-1: /dev/sda vendor: Intel model: SSDSC2CT080A4 size: 74.53 GiB + ID-2: /dev/sdb vendor: Intel model: SSDSC2CT080A4 size: 74.53 GiB +Partition: + ID-1: / size: 53.95 GiB used: 164.1 MiB (0.3%) fs: zfs logical: boot-pool/ROOT/24.04.2 + ID-2: /home size: 53.79 GiB used: 768 KiB (0.0%) fs: zfs logical: boot-pool/ROOT/24.04.2/home + ID-3: /opt size: 53.87 GiB used: 74.2 MiB (0.1%) fs: zfs logical: boot-pool/ROOT/24.04.2/opt + ID-4: /usr size: 55.92 GiB used: 2.12 GiB (3.8%) fs: zfs logical: boot-pool/ROOT/24.04.2/usr + ID-5: /var size: 53.82 GiB used: 31 MiB (0.1%) fs: zfs logical: boot-pool/ROOT/24.04.2/var + ID-6: /var/log size: 53.79 GiB used: 1.6 MiB (0.0%) fs: zfs + logical: boot-pool/ROOT/24.04.2/var/log \ No newline at end of file diff --git a/wizard/config/service.sh b/wizard/config/service.sh index 761dabc..a33adca 100644 --- a/wizard/config/service.sh +++ b/wizard/config/service.sh @@ -15,6 +15,8 @@ set service dhcp-server shared-network-name LAN subnet 192.168.1.0/24 static-map set service dhcp-server shared-network-name LAN subnet 192.168.1.0/24 static-mapping joey-nas mac-address '40:8d:5c:52:41:89' set service dhcp-server shared-network-name LAN subnet 192.168.1.0/24 static-mapping joey-nas2 ip-address '192.168.1.11' set service dhcp-server shared-network-name LAN subnet 192.168.1.0/24 static-mapping joey-nas2 mac-address '90:2b:34:37:ce:ea' +set service dhcp-server shared-network-name LAN subnet 192.168.1.0/24 static-mapping paladin ip-address '192.168.1.12' +set service dhcp-server shared-network-name LAN subnet 192.168.1.0/24 static-mapping paladin mac-address '30:5a:3a:76:80:8f' set service dhcp-server shared-network-name LAN subnet 192.168.1.0/24 static-mapping tasmota-toes-day ip-address '192.168.1.50' set service dhcp-server shared-network-name LAN subnet 192.168.1.0/24 static-mapping tasmota-toes-day mac-address '3C:61:05:F6:44:1E' set service dhcp-server shared-network-name LAN subnet 192.168.1.0/24 static-mapping tasmota-lab-rack ip-address '192.168.1.51'