Differences

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

--- network [2020-07-01 17:40] – tim
+++ network [2024-11-10 17:10] (current) – axiom
@@ Line 5: / Line 5: @@
 ^ Name ^ Model ^ Location ^
 | switch-g11-d | HPE A5120-48G | Top-rack |
+| switch-g11-e | Cisco WS-C2960-24TT-L | Top-rack |
 | switch-g1 | 3Com/HP A5500-48G | G1 ceiling |
-| switch-roof | HP Procurve 8-port | Block B roof/plant room |
+| <del>switch-roof</del> | <del>HP Procurve 8-port</del> | <del>Block B roof/plant room</del> |
 | 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>
-                hubs       summerhall (planned)
+                           summerhall
-                   \       /
+                           /
-                    \     /
+                          /
-                     \   /
+                         /
                      oxygen
-                       |        summerhall (actual)
+                       |                         tardis
-                       |       /
+     switch-g11-e      |                         /
-                       |      /
+                 \     |                        /
-     unifi-g11 -- switch-g11-d
+     unifi-g11 -- switch-g11-d -- switch-makerbee
-                      / \     \
+                 /    / \
-                     /   \    switch-roof-b -- ap-roof
+        unifi-g14    /   \
                     /     \
-                   /      switch-roof
+                   /      switch-roof-b -- ap-roof
                   /
           switch-g1
@@ Line 35: / Line 37: @@
 </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. Oxygen connects to a fibre converter 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 =====
@@ Line 45: / Line 45: @@
 Routing is handled by [[servers#oxygen|oxygen]], a Dell PowerEdge R610 running RouterOS.
-==== Old: HUBS ====
+==== Summerhall ====
-.34.62.0/26 and 2a04:5d00:70::/48 provided by [[https://hubs.net.uk/|HUBS]].
-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\\
@@ Line 71: / Line 62: @@
 | unifi-g11 | G11 (Store room) | Hacklab, spacenet |
 | unifi-g14 | G14 (Electronics) | Hacklab, spacenet |
-| unifi-makerbee | Floor 2 (MakerBee's office) | spacenet |
+| unifi-2.6 | MakerBee's office | spacenet |
+| unifi-2.10 | Novus' office | spacenet |
 | ap-roof | Roof | spacenet |
@@ Line 80: / Line 72: @@
   * [[https://netbox.ehlab.uk/|NetBox]] - for VLANs, IPs, hardware and port connections (for some switches)
   * [[ehana|Edinburgh Hacklab Assigned Numbers Authority (EHANA)]] - port connections (for some switches)
+===== Tardis =====
+As of 21/02/2022 for 1 year, Tardis Project are borrowing 209.16.157.128/29. They used to have colo in UoE but were recently kicked out and have no IP space. <del>FDX is giving them paid colo in the FDX office but no IP space as of yet.</del> As a gesture of goodwill Hacklab is letting them borrow this space to get them on their feet.
+<del>It is currently static routed to an FDX router in the rack and then handled by FDX to reach Tardis.</del>
+Tardis is now located in Block B room 2.6 (MakerBee). Their subnet is routed via MakerBee's VLAN 25.
+For any questions on the agreement please contact [[people:cazagen|Cameron Sharp]]
 ===== Manuals =====