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

diff --git a/doc/Network.mdwn b/doc/Network.mdwn
index 9b35cad..38d5014 100644
--- a/doc/Network.mdwn
+++ b/doc/Network.mdwn
@@ -5,15 +5,37 @@
 NOC operates a number of networks, available as tagged VLANs on the core
 switches (one in each half of the hackerspace).  These networks are:
 
-| Network    | VLAN id | Extra subnets    |
-|------------|---------|------------------|
-| Management |      23 | --               |
-| IoT        |      33 | --               |
-| Services   |      34 | --               |
-| Public     |      36 | 89.106.211.64/27 |
-| Guests     |     127 | --               |
-| Members    |     128 | 89.106.211.32/27 |
-| `0xFF`     |     255 | --               |
+| 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                       |
+
+[HAMNET]: https://wiki.oevsv.at/index.php/Kategorie:Digitaler_Backbone
+
+
+### `svc` -- Services LAN
+
+This network is intended for services that aren't directly exposed to users
+(be they humans or machines); this includes services exposed through a frontend
+(like realraum web services) and services only meant to be consumed by another
+service (like a database server).
+
+
+### `pub` -- Publicly-available services
+
+This network is intended for services that can be consumed by non-NOC systems,
+including our HTTP(S) frontend -- `entrance`, `mqtt`, ...
+
+Services in this network can restrict availability, for instance by only
+allowing clients connecting from our LANs, or by requiring authentication.
+
+No RFC 1918 subnet is used on this network, only `89.106.211.64/27`.
 
 
 ### Conventions
@@ -21,8 +43,10 @@ switches (one in each half of the hackerspace).  These networks are:
 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;
+  of `pub` (which uses `realraum.at`) and of the Funkfeuer VLAN (which has 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.
 
 
@@ -48,17 +72,18 @@ we use Ubiquity hardware running OpenWRT.
 
 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.
+`1` denotes the second appartment.
 
 
-### Wöhnung 2
+### W2
 
-#### Raum 1
+#### 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.)
 
 In r1w2, we have a rack hosting a number of devices:
+
 - the patch panel and core switch (`sw1.mgmt.realraum.at`) for W2;
 - the `alfred` virtualization server;
 - miscelaneous devices:
@@ -73,7 +98,7 @@ In r1w2, we have a rack hosting a number of devices:
 
 #### realfunk
 
-realfunk receives the `0xFF` and LAN VLANs trunked on a single fiber;
+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.
 
 Moreover, there is a Funkfeuer node there; it *does not* advertise the realraum
@@ -87,6 +112,7 @@ Cx. The patch panel has a fiber link to r2w1, and a copper link to an external
 antenna for our link to Funkfeuer.
 
 The network shelf in Cx also houses some important devices:
+
 - `gw.realraum.at`;
 - `smsgw.mgmt.realraum.at`, plus its mobile phone;
 - the PoE injectors for `ap0.mgmt.realraum.at` and `sch24.r3.ffgraz.net`;