X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=doc%2FNetwork.mdwn;h=3358ac50fbeceb0e8af671e6a805d4b3c863e290;hb=21bf2a6af24fc93a3eb0d12d09f10e866a1b39f6;hp=38d50146de21393e68aba0b2cd36eb2b7d711907;hpb=41d8f0e5aedbf842b45a07cfd5e3f8bafa28ee9f;p=noc.git

diff --git a/doc/Network.mdwn b/doc/Network.mdwn
index 38d5014..3358ac5 100644
--- a/doc/Network.mdwn
+++ b/doc/Network.mdwn
@@ -2,23 +2,33 @@
 
 ## Networks
 
-NOC operates a number of networks, available as tagged VLANs on the core
-switches (one in each half of the hackerspace).  These networks are:
-
-| name     | VLAN id | RFC1918 | Extra subnets    | Comment                              |
-|----------|---------|---------|------------------|--------------------------------------|
-| mgmt     |      32 | y       | --               | Management network                   |
-| iot      |      33 | y       | --               | IoT devices, room infrastructure     |
-| svc      |      34 | y       | --               | Services LAN, see below              |
-| pub      |      36 | n       | 89.106.211.64/27 | Publicly-available services          |
-| [HAMNET] |      44 | n       | 44.0.0.0/8       | Amateur Radio Digital Communications |
-| guests   |     127 | y       | --               | Exposed through the “realraum” SSIDs |
-| members  |     128 | y       | 89.106.211.32/27 | Accessed with per-member credentials |
-| `0xFF`   |     255 | n       | --               | Funkfeuer VLAN                       |
+NOC operates a number of networks, available as tagged VLANs on the core switches:
+
+| Name     |  ID | DNS | CIDR                               | Comment                              |
+|----------|-----|-----|------------------------------------|--------------------------------------|
+| realfunk |   6 | n   | 192.168.6.0/24                     | realfunk management network          |
+| mgmt     |  32 | y   | 192.168.32.0/24                    | management network                   |
+| iot      |  33 | y   | 192.168.33.0/24                    | IoT devices, room infrastructure     |
+| svc      |  34 | y   | 192.168.34.0/24                    | Services LAN, see below              |
+| [HAMNET] |  44 | n   | 44.0.0.0/8                         | Amateur Radio Digital Communications |
+| guests   | 127 | y   | 192.168.127.0/24                   | Exposed through the “realraum” SSIDs |
+| members  | 128 | y   | 89.106.211.32/27, 192.168.128.0/24 | Accessed with per-member credentials |
+| pub      | 130 | y   | 89.106.211.64/27                   | Publicly-available services          |
+| UPC      | 168 | n   | <dynamically assigned>             | UPC DOCSIS Internet                  |
+| `0xFF`   | 255 | n   | 10.12.240.240/28                   | Funkfeuer VLAN                       |
 
 [HAMNET]: https://wiki.oevsv.at/index.php/Kategorie:Digitaler_Backbone
 
 
+### `realfunk` -- realfunk management network
+
+This network will be used by realfunk to communicate between the ground station
+and things like SDR or similar stuff mounted on the roof. For now this network
+does not need DNS or connection to any other network. There also won't be any
+network services such as DHCP or recursive DNS. realfunk will probably run their
+own DHCP server.
+
+
 ### `svc` -- Services LAN
 
 This network is intended for services that aren't directly exposed to users
@@ -40,11 +50,8 @@ No RFC 1918 subnet is used on this network, only `89.106.211.64/27`.
 
 ### 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 `pub` (which uses `realraum.at`) and of the Funkfeuer VLAN (which has no
-  `realraum.at` zone).
+- The DNS zone for a given network is `NET.realraum.at`, with the exception of
+  `pub` (which uses `realraum.at`) and VLANs which have no `realraum.at` zone.
 - When a network uses RFC 1918 IP space, it is the 192.168.VID.0/24 subnet;
   for instance, the `iot` network has id 33 and uses the 192.168.33.0/24 subnet.
 - The gateway for a network is on the last IP for the subnet.
@@ -75,9 +82,7 @@ points are similarly `ap{0,1}.mgmt.realraum.at`. `0` denotes the main room, and
 `1` denotes the second appartment.
 
 
-### W2
-
-#### Room 1
+### W2 -- Room 1
 
 r1w2 has two fiber connections: one to the main room, and one to the radio room.
 (We use fiber to avoid creating a ground loop between the locations.)
@@ -96,10 +101,12 @@ In r1w2, we have a rack hosting a number of devices:
           on `alfred`).
 
 
-#### realfunk
+### W2 -- realfunk
 
-realfunk receives the `0xFF` and `guests` VLANs trunked on a single fiber;
-the switch there, `sw2.mgmt.realraum.at`, provides untagged ports on either VLAN.
+realfunk receives the VLANs trunked on a single fiber; the switch there, `sw2`,
+provides untagged ports on guests, `0xFF`, and HAMNET, which are labelled on the
+device. Moreover, a single port (5) has the untagged guests LAN, along with
+tagged HAMNET packets, used by the desktop computer there.
 
 Moreover, there is a Funkfeuer node there; it *does not* advertise the realraum
 SSIDs.