Differences

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

--- network [2019-05-24 11:51] – [Layer 2] tim
+++ network [2022-01-31 14:24] – [Layer 2] tim
@@ Line 8: / Line 8: @@
 | switch-roof | HP Procurve 8-port | Block B roof/plant room |
 | switch-roof-b | HP Procurve 24-port | Block B roof/plant room |
+| switch-makerbee | Netgear GS108Ev3 | Block B 2.6 MakerBee's office |
 | other unmanaged edge switches |||
 <code>
-      unifi-g6 -- switch-g11-d
+                hubs       summerhall
+                   \       /
+                    \     /
+                     \   /
+                     oxygen
+                       |
+                       |
+                       |
+     unifi-g11 -- switch-g11-d
                       / \     \
                      /   \    switch-roof-b -- ap-roof
@@ Line 26: / Line 35: @@
       [multiple in g1]
 </code>
+HUBS: Gigabit copper between oxygen and the HUBS router in our rack.
+Summerhall: Gigabit fibre between switch-g11-d and the Summerhall server room. This was originally intended to be connected directly to oxygen, but the SFP was incorrectly configured so we are currently using a VLAN via our switch.
 ===== Layer 3 =====
+Internal IPv4 10.38.32.0/20.
+Routing is handled by [[servers#oxygen|oxygen]], a Dell PowerEdge R610 running RouterOS.
+==== Old: HUBS ====
 .34.62.0/26 and 2a04:5d00:70::/48 provided by [[https://hubs.net.uk/|HUBS]].
-Internal IPv4 10.38.32.0/20, with an external NAT address of 185.34.62.2.
+Router address: 185.34.62.1\\
+External NAT address: 185.34.62.2
+This service will be ceased from 1st July 2020. The IPv4 addresses will continue to be routed via a tunnel until 14th July 2020.
+==== New: Summerhall ====
+Router IP: 46.226.0.133/31\\
+Gateway IP: 46.226.0.132
-Routing is handled by a [[servers|Dell PowerEdge running RouterOS]].
+IPv4 (owned by Hacklab): 209.16.157.0/24\\
+IPv6 (Fluency PA): 2a00:a600:6::/48\\
+IPv6 (HUBS PA): 2a04:5d00:70::/48
 ===== WiFi =====
@@ Line 40: / Line 69: @@
 | unifi-g1 | G1 (Main room) | Hacklab, spacenet |
 | unifi-g2 | G2 (Laser room) | Hacklab, spacenet |
-| unifi-g6 | G6 (Sensational Systems' office) | Hacklab, spacenet |
 | unifi-g8 | G8 (Workshop) | Hacklab, spacenet |
-| unifi-makerbee | Floor 2 (MakerBee's office) | spacenet |
+| unifi-g11 | G11 (Store room) | Hacklab, spacenet |
+| unifi-g14 | G14 (Electronics) | Hacklab, spacenet |
+| unifi-2.6 | MakerBee's office | spacenet |
+| unifi-2.10 | Novus' office | spacenet |
 | ap-roof | Roof | spacenet |