diff --git a/20221129120529-sailmaker_network.org b/20221129120529-sailmaker_network.org index 17e89f1..28b3e06 100644 --- a/20221129120529-sailmaker_network.org +++ b/20221129120529-sailmaker_network.org @@ -48,6 +48,14 @@ local MoCA network. subgraph cluster_basement { label="Basement" ont[label="ONT",shape="square"] + subgraph cluster_basement_equipment { + label="Equipment Panel" + router[label="Router",shape="rectangle"] + router_adapter[label="MoCA Adapter",shape="rectangle"] + poe_switch[label="PoE Switch",shape="rectangle"] + hue_bridge[label="HUE Bridge",shape="rectangle"] + omada_controller[label="Omada Controller",shape="rectangle"] + } subgraph cluster_splitter_basement { label="Splitter" node[shape="circle"] @@ -73,12 +81,11 @@ local MoCA network. } subgraph cluster_media_room { label="Media Room" - router[label="Router",shape="rectangle"] - router_adapter[label="MoCA Adapter",shape="rectangle"] } subgraph cluster_kitchen { - label="Kitchen Island" + label="Kitchen" node[shape="circle"] + kitchen_ap[label="EAP"] kitchen_in[label=""] } } @@ -87,15 +94,26 @@ local MoCA network. subgraph cluster_office { label="Office" office_adapter[label="MoCA Adapter",shape="rectangle"] - office_switch[label="Switch",shape="rectangle"] office_dock[label="Laptop Dock",shape="rectangle"] office_tv[label="Office TV",shape="rectangle"] - reason[label="Reason",shape="square"] + + subgraph cluster_office_rack { + label="Network Rack" + office_patch_panel[label="Patch Panel", shape="rectangle"] + office_switch[label="Switch",shape="rectangle"] + nomadix[label="Nomadix",shape="rectangle"] + office_rack_power[label="Office Rack Power",shape="rectangle"] + reason[label="Reason",shape="square"] + } + edge[color="blue",penwidth=2] // Ethernet - office_adapter -> office_switch - office_switch -> office_dock + office_adapter -> office_patch_panel + office_patch_panel -> office_switch office_switch -> office_tv + office_switch -> office_dock + office_switch -> nomadix + office_switch -> office_rack_power office_switch -> reason } @@ -130,6 +148,12 @@ local MoCA network. edge[color="blue",penwidth=2] // Ethernet ont -> router router -> router_adapter + router -> hue_bridge + router -> poe_switch + + edge[color="gold",penwidth=2] // Powered Ethernet + poe_switch -> omada_controller + poe_switch -> kitchen_ap edge[color="black",penwidth=5] // Coaxial router_adapter -> s1 [constraint=none] diff --git a/20240822235459-sailmaker_network_services.org b/20240822235459-sailmaker_network_services.org index 8e16223..f2cbdac 100644 --- a/20240822235459-sailmaker_network_services.org +++ b/20240822235459-sailmaker_network_services.org @@ -5,32 +5,35 @@ Services running on the [[id:e83c1ece-35f6-414d-986f-59533fb3d6a9][Sailmaker Network]]. -| Server | Service | Hostname | IP Address | Web UI Port | Proxy Host | Proxy Port | -|---------------+---------------------+----------+--------------+-------------+--------------------------+------------| -| PiHole | PiHole | pi.hole | 192.168.1.2 | 80 | | | -| PiHole | Uptime Kuma | pi.hole | 192.168.1.2 | 3001 | | | -| HomeAssistant | Home Assistant | | 192.168.1.13 | 8123 | home-assistant.sailmaker | 80 | -| HomeAssistant | Nginx Proxy Manager | | 192.168.1.13 | 81 | | | -| HomeAssistant | Mosquitto | | 192.168.1.13 | | | | -| Nomadix | PiHole | | 192.168.1.3 | 80 | | | -| Nomadix | Traefik | | 192.168.1.8 | 8080 | | | -| Nomadix | Wireguard | | 192.168.1.6 | 10086 | | | +* Core Services -* Network Map +| IP | Service | Device | Role | +|---------------+------------------+--------------+----------------------------| +| 192.168.1.1 | Omada Router | Router | Routing | +| DHCP | Omada EAP | Access Point | Wireless AP | +| DHCP | [[https://omada.sailmaker.fenix.lgbt/][Omada Controller]] | Controller | Network configuration | +| 192.168.1.5 | [[https://proxmox.sailmaker.fenix.lgbt/][Proxmox]] | Nomadix | Primary service host | +| 192.168.1.2 | [[http://pi-hole.sailmaker.fenix.lgbt/admin/][PiHole]] | Proxmox | DNS / DHCP | +| 192.168.1.6 | Wireguard | Proxmox | VPN | +| 192.168.1.7 | [[https://ldap.sailmaker.fenix.lgbt/][LLDAP]] | Proxmox | Authentication | +| DHCP | [[https://sailmaker.fenix.lgbt/][Heimdall]] | Proxmox | Service Dashboard | +| 192.168.1.8 | Traefik | Proxmox | Inbound HTTP/HTTPS traffic | +| 192.168.1.13 | Home Assistant | Proxmox | Home automation | +| 192.168.1.14 | Mosquitto | Proxmox | Message broker | +| 192.168.1.183 | NAS | Reason | Storage and services | +| 192.168.1.183 | Grafana | Reason | Monitoring | -- Primary services (.1 - .9) must be hosted on the Nomadix device -- Secondary services (.10 - .19) should be hosted on the Nomadix device or a standalone device -- Tertiary -| IP | Service | Role | -|--------------+-------------------+------------------------------| -| 192.168.1.1 | Internet Router | Routing | -| 192.168.1.2 | PiHole | (DNS / DHCP) | -| 192.168.1.3 | *reserved* | | -| 192.168.1.4 | *reserved* | | -| 192.168.1.5 | Proxmox (Nomadix) | Primary service host | -| 192.168.1.6 | Wireguard | VPN | -| 192.168.1.7 | LLDAP | Authentication | -| 192.168.1.8 | Proxy Manager | (inbound HTTP/HTTPS traffic) | -| 192.168.1.9 | | | -|--------------+-------------------+------------------------------| -| 192.168.1.13 | Home Assistant | Home automation | +* Public Services +| IP | Service | Device | Role | +|---------------+-----------+--------+------------------------| +| 192.168.1.183 | Forgejo | Reason | Git | +| 192.168.1.183 | Sharkey | Reason | Federated social media | +| 192.168.1.183 | Nextcloud | Reason | File synchronization | +| 192.168.1.183 | Calibre | Reason | Ebooks | +| 192.168.1.183 | Plex | Reason | Media | +| 192.168.1.183 | Tutor | Reason | Magic collection | +| 192.168.1.183 | Wallabag | Reason | Articles | + +* Internal Services +| IP | Service | Device | Role | +|---------------+------------------+--------------+----------------------------| diff --git a/sailmaker-network.png b/sailmaker-network.png index 5592db6..133bcdd 100644 Binary files a/sailmaker-network.png and b/sailmaker-network.png differ