Differences

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

--- network [2018-02-01 15:32] – [Layer 3] tim
+++ network [2022-02-23 14:47] – cazagen
@@ 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 |
+| switch-makerbee | Netgear GS108Ev3 | Block B 2.6 MakerBee's office |
+| other unmanaged edge switches |||
+<code>
+                hubs       summerhall
+                   \       /
+                    \     /
+                     \   /
+                     oxygen
+                       |
+                       |
+                       |
+     unifi-g11 -- switch-g11-d
+                      / \     \
+                     /   \    switch-roof-b -- ap-roof
+                    /     \
+                   /      switch-roof
+                  /
+          switch-g1
+         /    |    \
+        /     |     \
+       /      |      \
+unmanaged-g2  |    unifi-g1/g2/g8
+              |
+              |
+      [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 =====
-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. The IPv4 addresses will continue to be routed via a tunnel until 14th 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
+IPv4 (owned by Hacklab): 209.16.157.0/24\\
+IPv6 (Fluency PA): 2a00:a600:6::/48\\
+IPv6 (HUBS PA): 2a04:5d00:70::/48
+===== 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-2.6 | MakerBee's office | spacenet |
+| unifi-2.10 | Novus' 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)
+===== 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. FDX is giving them paid colo in the FDX office but no IP space as of yet. As a gesture of goodwill Hacklab is letting them borrow this space to get them on their feet.
+It is currently static routed to an FDX router in the rack and then handled by FDX to reach Tardis.
+For any questions on the agreement please contact [[people:cazagen|Cameron Sharp]]
 ===== Manuals =====