m4rshal/HomeNetwork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: m4rshal:618896193cde8a980a73d7211cdd12046b6bb29c
Branches Tags
m4rshal:main
...
compare: m4rshal:main
Branches Tags
m4rshal:main

2 Commits
618896193c ... main

Author SHA1 Message Date
m4rshal
38b9e8f872 docs: ap-ux7-01 に VLAN 50/60 の IP を割り当て 
- VLAN 50 (Guest): 10.0.50.21
- VLAN 60 (IoT):   10.0.60.21
- VLAN 100 (PRV):  192.168.100.21 (既存)

network-diagram.html / ip-map.md / 増備計画.md に反映。

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-04-18 14:42:54 +09:00
m4rshal
a24033e8aa docs: network-diagram.html を最新設計に更新 
- ap-prv-01 → ap-ux7-01 (UX-7) に更新
- PRV セクション: SSID/VLAN テーブルを VLAN 101/102 → 50/60 に刷新
- SSID テーブルに VLAN カラムと終端先を追加
- VLAN 20 に ms-01-pve / ms-02-pve (MS-A2) を追加

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-04-18 14:40:16 +09:00
3 changed files with 26 additions and 17 deletions
Expand all files Collapse all files

4
docs/増備計画.md
View File

@@ -116,7 +116,9 @@
| `stg-01-nas` | STORAGE | `10.0.30.11` |
| `opnsense-01` | PRV | `192.168.100.2` |
| `sw-flex` | PRV | `192.168.100.11` |
| `ap-ux7-01` | PRV | `192.168.100.21` |
| `ap-ux7-01` | PRV (VLAN 100) | `192.168.100.21` |
| `ap-ux7-01` | IoT (VLAN 60) | `10.0.60.21` |
| `ap-ux7-01` | Guest (VLAN 50) | `10.0.50.21` |
---

10
feature/network/ip-map.md
View File

@@ -113,11 +113,11 @@
AP uplink は sw-flex へトランク（VLAN 50/60/100）。OPNsense が全 VLAN を終端し、50/60 は RTX 1300 へルーティング。
| SSID | VLAN タグ | ネットワーク | DHCP / GW | 終端 |
|---|---|---|---|---|
| Main（一般端末） | VLAN 100 | `192.168.100.0/24` | `192.168.100.100`–`.200` / OPNsense | OPNsense |
| IoT | VLAN 60 | `10.0.60.0/24` | `10.0.60.100`–`.149` / `10.0.60.1` | OPNsense → RTX 1300 |
| Guest | VLAN 50 | `10.0.50.0/24` | `10.0.50.100`–`.220` / `10.0.50.1` | OPNsense → RTX 1300 |
| SSID | VLAN タグ | ネットワーク | AP IP | DHCP / GW | 終端 |
|---|---|---|---|---|---|
| Main（一般端末） | VLAN 100 | `192.168.100.0/24` | `192.168.100.21` | `192.168.100.100`–`.200` / OPNsense | OPNsense |
| IoT | VLAN 60 | `10.0.60.0/24` | `10.0.60.21` | `10.0.60.100`–`.149` / `10.0.60.1` | OPNsense → RTX 1300 |
| Guest | VLAN 50 | `10.0.50.0/24` | `10.0.50.21` | `10.0.50.100`–`.220` / `10.0.50.1` | OPNsense → RTX 1300 |
- **インフラ静的**: `192.168.100.1` – `.30`
- **予備/将来用**: `192.168.103.0/24`

29
feature/network/network-diagram.html
View File

@@ -119,6 +119,8 @@
<div class="device-row"><span class="device-icon">🍓</span><span class="device-name">sc-rpi4-01 <span class="hw">RPi4</span></span><span class="device-ip" style="color:var(--vlan20h)">10.0.20.21</span></div>
<div class="device-row"><span class="device-icon">🖥</span><span class="device-name">x86-01-pve <span class="hw">GEM 10</span></span><span class="device-ip" style="color:var(--vlan20h)">10.0.20.51</span></div>
<div class="device-row"><span class="device-icon">🖥</span><span class="device-name">x86-02-pve <span class="hw">GEM 10</span></span><span class="device-ip" style="color:var(--vlan20h)">10.0.20.52</span></div>
<div class="device-row"><span class="device-icon">🖥</span><span class="device-name">ms-01-pve <span class="hw">MS-A2</span></span><span class="device-ip" style="color:var(--vlan20h)">10.0.20.81</span></div>
<div class="device-row"><span class="device-icon">🖥</span><span class="device-name">ms-02-pve <span class="hw">MS-A2</span></span><span class="device-ip" style="color:var(--vlan20h)">10.0.20.82</span></div>
</div>
<div class="dhcp-bar">
<span class="dhcp-label">Static</span>
@@ -173,6 +175,7 @@
</div>
<div class="device-list">
<div class="device-row"><span class="device-icon">🔀</span><span class="device-name">Gateway</span><span class="device-ip" style="color:var(--vlan50)">10.0.50.1</span></div>
<div class="device-row"><span class="device-icon">📶</span><span class="device-name">ap-ux7-01 <span class="hw">UX-7 · Guest SSID</span></span><span class="device-ip" style="color:var(--vlan50)">10.0.50.21</span></div>
</div>
<div class="dhcp-bar">
<span class="dhcp-label">DHCP</span>
@@ -190,6 +193,7 @@
</div>
<div class="device-list">
<div class="device-row"><span class="device-icon">🔀</span><span class="device-name">Gateway</span><span class="device-ip" style="color:var(--vlan60)">10.0.60.1</span></div>
<div class="device-row"><span class="device-icon">📶</span><span class="device-name">ap-ux7-01 <span class="hw">UX-7 · IoT SSID</span></span><span class="device-ip" style="color:var(--vlan60)">10.0.60.21</span></div>
<div class="device-row"><span class="device-icon">📦</span><span class="device-name">静的 IoT 機器</span><span class="device-ip" style="color:var(--vlan60)">.2 – .99</span></div>
</div>
<div class="dhcp-bar">
@@ -204,7 +208,7 @@
<div class="section-header">
<div class="section-dot" style="background:var(--prv)"></div>
<span class="section-title" style="color:var(--prv)">VLAN 100 — PRV</span>
<span class="section-range">192.168.100.0/22 · AP VLAN非対応 · SSID別論理分離</span>
<span class="section-range">192.168.100.0/22 · ap-ux7-01 (UX-7) · VLAN 50/60/100</span>
</div>
<div class="prv-cols">
<div class="prv-col">
@@ -227,36 +231,39 @@
</div>
<div class="device-row" style="grid-template-columns:18px 1fr 150px">
<span class="device-icon">📶</span>
<span class="device-name">ap-prv-01 <span class="hw">sw-flex 配下</span></span>
<span class="device-name">ap-ux7-01 <span class="hw">UX-7</span></span>
<span class="device-ip" style="color:var(--prv)">192.168.100.21</span>
</div>
</div>
<div class="note">静的: .1–.30　予備: 192.168.103.0/24</div>
</div>
<div class="prv-col">
<div class="prv-col-header">DHCP スコープ（SSID 別 / 論理分離）</div>
<div class="prv-col-header">SSID / VLAN 対応（ap-ux7-01 トランク: VLAN 50/60/100）</div>
<table class="ssid-table">
<thead>
<tr><th>SSID 用途</th><th>便宜上のCIDR</th><th>DHCP レンジ</th><th>OPNsense ルール</th></tr>
<tr><th>SSID</th><th>VLAN</th><th>サブネット</th><th>DHCP レンジ</th><th>終端 / ルール</th></tr>
</thead>
<tbody>
<tr>
<td style="color:#e2e8f0">Main（一般端末）</td>
<td style="color:var(--prv)">100</td>
<td style="color:var(--prv)">192.168.100.0/24</td>
<td style="color:var(--muted)">.100 – .200</td>
<td><span class="rule-allow">✓ 内部アクセス許可</span></td>
<td><span class="rule-allow">✓ OPNsense · 内部許可</span></td>
</tr>
<tr>
<td style="color:#e2e8f0">IoT</td>
<td style="color:var(--vlan60)">192.168.101.0/24</td>
<td style="color:var(--muted)">.100 – .200</td>
<td><span class="rule-deny">✗ 内部遮断 / WAN のみ</span></td>
<td style="color:var(--vlan60)">60</td>
<td style="color:var(--vlan60)">10.0.60.0/24</td>
<td style="color:var(--muted)">.100 – .149</td>
<td><span class="rule-deny">✗ OPNsense→RTX · WAN のみ</span></td>
</tr>
<tr>
<td style="color:#e2e8f0">Guest</td>
<td style="color:var(--vlan50)">192.168.102.0/24</td>
<td style="color:var(--muted)">.100 – .200</td>
<td><span class="rule-deny">✗ 内部遮断 / WAN のみ</span></td>
<td style="color:var(--vlan50)">50</td>
<td style="color:var(--vlan50)">10.0.50.0/24</td>
<td style="color:var(--muted)">.100 – .220</td>
<td><span class="rule-deny">✗ OPNsense→RTX · WAN のみ</span></td>
</tr>
</tbody>
</table>