greg/nixos
1
0
Fork 2
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix: correct pve1 IP to 10.42.0.4, rename stale joel/opnsense refs' (#32) from emily/nixos:fix/pve1-ip-correction into main
buildbot/nix-eval Build done. (1 warning)
Details
buildbot/nix-build Build done.
Details
buildbot/nix-effects Build done.
Details

Browse Source 
Reviewed-on: #32
This commit was merged in pull request #32.
This commit is contained in:
greg
2026-08-08 05:58:50 +00:00
parent c9671121dd fcb5a89727
commit 076df9f924
5 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hosts/unstable/genesis/net/hosts
+2 -3
View File
@@ -1,12 +1,11 @@
# Local hosts # Local hosts
10.42.0.1 switch switch.thehellings.lan # Core switch for the network 10.42.0.1 switch switch.thehellings.lan # Core switch for the network
10.42.0.3 ap ap.thehellings.lan # OpenWRT access point (static IP) 10.42.0.3 ap ap.thehellings.lan # OpenWRT access point (static IP)
10.42.0.4 joel.thehellings.lan # Proxmox 10.42.0.4 pve1.thehellings.lan # Proxmox
10.42.0.5 sanswitch.thehellings.lan # Core switch for the SAN 10.42.0.5 sanswitch.thehellings.lan # Core switch for the SAN
# Home servers # Home servers
10.42.1.1 pve1.thehellings.lan 10.42.1.1 udm router udm.thehellings.lan router.thehellings.lan # Ubiquiti UDM gateway
10.42.1.2 opnsense router opnsense.thehellings.lan router.thehellings.lan
10.42.1.3 printer.thehellings.lan 10.42.1.3 printer.thehellings.lan
10.42.1.4 chronicles chronicles.thehellings.lan nas.thehellings.lan s3.thehellings.lan 10.42.1.4 chronicles chronicles.thehellings.lan nas.thehellings.lan s3.thehellings.lan
10.42.1.5 genesis genesis.thehellings.lan dns dns.thehellings.lan smart smart.thehellings.lan speedtest.thehellings.lan nixcache.thehellings.lan gitcache.thehellings.lan 10.42.1.5 genesis genesis.thehellings.lan dns dns.thehellings.lan smart smart.thehellings.lan speedtest.thehellings.lan nixcache.thehellings.lan gitcache.thehellings.lan
hosts/unstable/genesis/networking/dhcp.nix
+1 -5
View File
@@ -60,7 +60,7 @@
reservations = [ reservations = [
# Static IPs for personal work # Static IPs for personal work
{ {
hw-address = "00:23:24:72:64:32"; # Joel hw-address = "00:23:24:72:64:32"; # PVE1
ip-address = "10.42.0.4"; ip-address = "10.42.0.4";
} }
{ {
@@ -76,10 +76,6 @@
#ip-address = "10.42.2.253"; #ip-address = "10.42.2.253";
ip-address = "10.42.100.6"; ip-address = "10.42.100.6";
} }
{
hw-address = "7c:83:34:b9:ee:ec"; # PVE1
ip-address = "10.42.1.1";
}
{ {
hw-address = "74:ee:2a:66:b3:51"; # printer hw-address = "74:ee:2a:66:b3:51"; # printer
ip-address = "10.42.1.3"; ip-address = "10.42.1.3";
manifests/monitoring/config.yaml
+2 -2
View File
@@ -51,8 +51,8 @@ data:
static_configs: static_configs:
- targets: - targets:
- "10.42.0.3" # OpenWRT access point - "10.42.0.3" # OpenWRT access point
- "10.42.0.4" # Joel (Proxmox) - "10.42.0.4" # pve1 (Proxmox)
- "10.42.1.1" # pve1 (Proxmox) - "10.42.1.1" # UDM gateway (Ubiquiti)
- "10.42.1.4" # chronicles (Synology NAS) - "10.42.1.4" # chronicles (Synology NAS)
- "10.42.1.14" # nas1 (TrueNAS) - "10.42.1.14" # nas1 (TrueNAS)
- "10.42.2.57" # odoo - "10.42.2.57" # odoo
modules/hm/gui/bookmarks.nix
+1 -1
View File
@@ -230,7 +230,7 @@
bookmarks = [ bookmarks = [
{ {
name = "PVE1"; name = "PVE1";
url = "https://10.42.1.1:8006/"; url = "https://10.42.0.4:8006/";
} }
{ {
name = "Jeremiah"; name = "Jeremiah";
network.json
+3 -3
View File
@@ -135,9 +135,6 @@
"pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILFYyzz/9i5rXprCQj9IL1ulrbQ6E9BOSeOcvf4D/b0G", "pubkey": "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILFYyzz/9i5rXprCQj9IL1ulrbQ6E9BOSeOcvf4D/b0G",
"tags": ["server"] "tags": ["server"]
}, },
"joel": {
"ip": "10.42.0.4"
},
"k3s": { "k3s": {
"aliases": ["*.k3s"], "aliases": ["*.k3s"],
"ip": "10.42.5.1", "ip": "10.42.5.1",
@@ -151,6 +148,9 @@
"printer": { "printer": {
"ip": "10.42.1.3" "ip": "10.42.1.3"
}, },
"pve1": {
"ip": "10.42.0.4"
},
"pve2": { "pve2": {
"ip": "10.42.1.15" "ip": "10.42.1.15"
}, },