Differences

This shows you the differences between two versions of the page.

--- network [2018-02-01 15:34] – [Layer 2] tim
+++ network [2020-06-03 16:23] – [Layer 2] tim
@@ Line 4: / Line 4: @@
 ^ Name ^ Model ^ Location ^
-| switch-g11-a | Dell PowerConnect 6024 | Top-rack |
+| switch-g11-d | HPE A5120-48G | Top-rack |
-| switch-g11-b | Dell PowerConnect 5224 | Mid-rack |
+| switch-g1 | 3Com/HP A5500-48G | G1 ceiling |
-| switch-g11-c | Netgear GS724T | Server-shelf |
-| switch-g1 | Netgear GS724T | G1 ceiling |
 | switch-roof | HP Procurve 8-port | Block B roof/plant room |
-| other non-managed edge switches |||
+| switch-roof-b | HP Procurve 24-port | Block B roof/plant room |
+| other unmanaged edge switches |||
 <code>
-switch-g11-b -- switch-g11-a -- switch-g11-c
+                hubs       summerhall (planned)
-                     / \
+                   \       /
-                    /   \
+                    \     /
-                   /     \
+                     \   /
-          switch-g1       switch-roof
+                     oxygen
+                       |        summerhall (actual)
+                       |       /
+                       |      /
+     unifi-g11 -- switch-g11-d
+                      / \     \
+                     /   \    switch-roof-b -- ap-roof
+                    /     \
+                   /      switch-roof
+                  /
+          switch-g1
+         /    |    \
+        /     |     \
+       /      |      \
+unmanaged-g2  |    unifi-g1/g2/g8
+              |
+              |
+      [multiple in g1]
 </code>
 ===== Layer 3 =====
-External IPv4: 185.34.62.0/26 provided by [[https://hubs.net.uk/|HUBS]].
+Internal IPv4 10.38.32.0/20.
-Internal IPv4: 10.38.32.0/20, with an external NAT address of 185.34.62.2.
+Routing is handled by [[servers#oxygen|oxygen]], a Dell PowerEdge R610 running RouterOS.
-IPv6: 2a04:5d00:70::/48 provided by [[https://hubs.net.uk/|HUBS]].
+==== Old: HUBS ====
-Routing is currently handled by a Mikrotik RouterBOARD 450G.
+.34.62.0/26 and 2a04:5d00:70::/48 provided by [[https://hubs.net.uk/|HUBS]].
-==== Future ====
+Router address: 185.34.62.1\\
+External NAT address: 185.34.62.2
-In future, routing will be handled by VMs on [[servers|Oxygen]], both running [[https://bsdrp.net/|BSDRP]].
+This service will be ceased from 1st July 2020.
-At this point we will be splitting the responsibilities of the old Mikrotik 450G into two - One VM (Nickel) to handle our edge (BGP speaking + Public IP Space Gateway), and one (Iron) to handle NAT and act as a gateway for all internal space. [[https://www.freebsd.org/doc/handbook/firewalls-pf.html|PF]] will be handling NAT + Firewalling on these machines.
+==== New: Summerhall ====
+Router IP: 46.226.0.133/31\\
+Gateway IP: 46.226.0.132
+We have requested an IPv6 /48 allocation.
+===== WiFi =====
+^ Hostname ^ Location ^ SSIDs ^
+| unifi-g1 | G1 (Main room) | Hacklab, spacenet |
+| unifi-g2 | G2 (Laser room) | Hacklab, spacenet |
+| unifi-g8 | G8 (Workshop) | Hacklab, spacenet |
+| unifi-g11 | G11 (Store room) | Hacklab, spacenet |
+| unifi-g14 | G14 (Electronics) | Hacklab, spacenet |
+| unifi-makerbee | Floor 2 (MakerBee's office) | spacenet |
+| ap-roof | Roof | spacenet |
+See [[wifi|WiFi]] for client connection details.
 ===== Record Keeping =====
-  * [[https://netbox.ehlab.uk/|NetBox]] - for VLANs, IPs, hardware and port locations (for some switches)
+  * [[https://netbox.ehlab.uk/|NetBox]] - for VLANs, IPs, hardware and port connections (for some switches)
-  * [[ehana|Edinburgh Hacklab Assigned Numbers Authority (EHANA)]] - port locations (for some switches)
+  * [[ehana|Edinburgh Hacklab Assigned Numbers Authority (EHANA)]] - port connections (for some switches)
 ===== Manuals =====