X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=doc%2FNetwork.mdwn;h=b2f0e80564eda41bd1524374b026d77e82590f58;hb=9c87d9c99a7f3f0476acd3f5ded57775eeb9a920;hp=689766cc9c7b8ad009986070434b8a12fbb43b77;hpb=bd48a51b417c3df7b7113bcfc565a5d4c3765d6a;p=noc.git

diff --git a/doc/Network.mdwn b/doc/Network.mdwn
index 689766c..b2f0e80 100644
--- a/doc/Network.mdwn
+++ b/doc/Network.mdwn
@@ -5,15 +5,34 @@
 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.32/27 |
-| Guests     |     127 | --               |
-| Members    |     128 | 89.106.211.64/27 |
-| `0xFF`     |     255 | --               |
+| name       | VLAN id | Extra subnets    | Comment                              |
+|------------|---------|------------------|--------------------------------------|
+| Management |      32 | --               | Management network                   |
+| IoT        |      33 | --               | IoT devices, room infrastructure     |
+| Services   |      34 | --               | Services LAN, see below              |
+| Public     |      36 | 89.106.211.64/27 | Publicly-available services          |
+| Guests     |     127 | --               | Exposed through the “realraum” SSIDs |
+| Members    |     128 | 89.106.211.32/27 | Accessed with per-member credentials |
+| `0xFF`     |     255 | --               | Funkfeuer VLAN                       |
+
+
+### `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,11 +40,23 @@ 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`);
+  of the public services network (which uses `realraum.at`) and of the Funkfeuer
+  VLAN (which has no `realraum.at` zone).
 - Networks using RFC 1918 IP space use 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.
 
 
+### Routing and firewall rules
+
+This network diagram represents networks, and the connection flows between them:
+an arrow from A to B means that a connection can be opened from network A to
+network B.  In all cases, a subset of ICMP (ECHO, ...) is allowed.
+
+Note that any given system might have interfaces in several of these networks.
+
+[[!img Network/overview.svg alt="r³ network overview"]]
+
 
 ## WiFi
 
@@ -38,17 +69,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:
@@ -77,6 +109,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`;