doc/Network: Update the subnets description

[noc.git] / doc / Network.mdwn

diff --git a/doc/Network.mdwn b/doc/Network.mdwn
index 24255eb..714b59c 100644 (file)
--- a/doc/Network.mdwn
+++ b/doc/Network.mdwn
@@ -1,15 +1,26 @@
 # Network infrastructure
 
-## VLANs
+## Networks
 
-NOC runs 2 core switches (one in each room), carrying a bunch of VLANs:
-- 33 is the management VLAN (192.168.33.0/24);
-- 127 is the LAN (192.168.127.0/24);
-- 255 (`0xFF`) is our Funkfeuer VLAN.
+NOC operates a number of networks, available as tagged VLANs on the core
+switches (one in each half of the hackerspace).  These networks are:
+
+- the IoT network (33);
+- the services interconnect (34) and management (23) networks;
+- the guests (127) and members (128) LANs;
+- the public services network (36, 89.106.211.32/27);
+- the Funkfeuer VLAN (255, `0xFF`).
+
+
+### Conventions
+
+We use a number of conventions to make things more consistent:
+
+- The DNS zone for a given network is `NET.realraum.at`, with the exception
+  of the public services network (which has `realraum.at`);
+- Networks using RFC 1918 IP space use the 192.168.VID.0/24 subnet;
+- The gateway for a network is on the last IP for the subnet.
 
-The switches have hostnames `sw{0,1}.mgmt.realraum.at`, and the WiFi access
-points are similarly `ap{0,1}.mgmt.realraum.at`. `0` denotes the main room, and
-`1` denotes Wöhnung 2.
 
 
 ## WiFi
@@ -18,12 +29,14 @@ Each location has a single AP, `ap{0,1}.mgmt.realraum.at`, which provides SSIDs
 for the management VLAN (`realstuff`) and the LAN (`realraum` and `realraum5`);
 we use Ubiquity hardware running OpenWRT.
 
-Moreover, realfunk has an Archer C7 acting as a VLAN-capable switch
-and as a Funkfeuer node; it does **not** provide the realraum SSIDs.
-
 
 ## Physical locations
 
+The switches have hostnames `sw{0,1}.mgmt.realraum.at`, and the WiFi access
+points are similarly `ap{0,1}.mgmt.realraum.at`. `0` denotes the main room, and
+`1` denotes Wöhnung 2.
+
+
 ### Wöhnung 2
 
 #### Raum 1
@@ -42,13 +55,16 @@ In r1w2, we have a rack hosting a number of devices:
 **Note:** members setting up devices that only need power and network access
           should do so in this rack (or even better, run a VM or a container
           on `alfred`).
-          
+
 
 #### realfunk
 
 realfunk receives the `0xFF` and LAN VLANs trunked on a single fiber;
 the switch there, `sw2.mgmt.realraum.at`, provides untagged ports on either VLAN.
 
+Moreover, there is a Funkfeuer node there; it *does not* advertise the realraum
+SSIDs.
+
 
 ### Main room