From: Christian Pointner Date: Sat, 7 Jul 2018 20:45:50 +0000 (+0200) Subject: Merge pull request #28 from realraum/doc-ci X-Git-Url: https://git.realraum.at/?a=commitdiff_plain;h=9952ef254a75042ea1d1c64ea6b0840e07588dab;hp=0feae2dfad962b97009e9166d17fc1e76225278b;p=noc.git Merge pull request #28 from realraum/doc-ci Add Travis CI build for the documentation --- diff --git a/doc/Network.mdwn b/doc/Network.mdwn index 65640e1..634e702 100644 --- a/doc/Network.mdwn +++ b/doc/Network.mdwn @@ -10,10 +10,10 @@ switches (one in each half of the hackerspace). These networks are: | 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 | -| pub | 36 | y | 89.106.211.64/27 | Publicly-available services | | [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 | | `0xFF` | 255 | n | 10.12.240.240/28 | Funkfeuer VLAN | [HAMNET]: https://wiki.oevsv.at/index.php/Kategorie:Digitaler_Backbone