redbrick · Arisamiga · Jun 1, 2026 · Jun 1, 2026 · Jun 2, 2026 · Jun 2, 2026
diff --git a/docs/hardware/aperture/about.md b/docs/hardware/aperture/about.md
@@ -6,7 +6,7 @@ tags:
   - aperture
   - hardware
 created: 2022-05-16T01:44:40
-modified: 2024-03-13T04:49:14
+modified: 2026-06-06T04:49:14
 title: About Aperture
 ---
 
@@ -18,10 +18,6 @@ It consists of:
 
 - 3x Dell R6515 - [`glados`](glados.md), [`wheatley`](wheatley.md), [`chell`](chell.md)
 
-| CPU                                       | RAM                               | Storage                          |
-| ----------------------------------------- | --------------------------------- | -------------------------------- |
-| AMD 7302P 3GHz, 16C/32T, 128M, 155W, 3200 | 2x 16GB RDIMM, 3200MT/s Dual Rank | 4x 2TB SATA HDDs (hardware RAID) |
-
 - 2x Ubiquiti USW Pro - `rivendell`, `isengard`
 - 1x Ubiquiti UDM Pro - `mordor`
 
@@ -31,39 +27,25 @@ The three servers are named [`glados`](glados.md) , [`wheatley`](wheatley.md) an
 
 ## Networks
 
-The firewall is called [`mordor`](../network/mordor.md), and the two 24-port switches are called [`rivendell` and `isengard`](../network/switches.md).
-
-## Networking
-
-The IP address range for the [`aperture`](index.md) subnet is `10.10.0.0/24`, with `10.10.0.0/16` being used for user VMs.
-
-|  Hostname   | Internal Address | External Address | Purpose  |
-|:-----------:|:----------------:|:----------------:|:--------:|
-|  `mordor`   |    10.10.0.1     |       N/A        | Firewall |
-| `rivendell` |    10.10.0.2     |       N/A        |  Switch  |
-| `isengard`  |    10.10.0.3     |       N/A        |  Switch  |
-|  `glados`   |    10.10.0.4     |   136.206.16.4   |  Server  |
-| `wheatley`  |    10.10.0.5     |   136.206.16.5   |  Server  |
-|   `chell`   |    10.10.0.6     |   136.206.16.6   |  Server  |
+The firewall is called [`mordor`](../network/mordor.md), and the two 24-port switches are called [`rivendell`](../network/rivendell.md) and [`isengard`](../network/isengard.md).
 
 > [!NOTE] Note!
 > **Blue** cables are used for **production network**.
 
 ## KVM
 
-`nexus` is the name of the KVM switch. It's internal IP address is `10.10.0.10`.
+`nexus` is the name of the KVM switch. It's internal IP address is `10.10.0.100`.
 
-[`glados`](glados.md) is connected on port 1, [`wheatley`](wheatley.md) on port 2, and [`chell`](chell.md) on port 3.
+> [!ERROR] Note!
+> **Red** cables are used for **KVM network**.
 
-> [!WARNING] Note!
-> **Yellow** cables are used for **KVM network**.
 
 ## IDRAC
 
 The new servers are all equipped with IDRACs. These still need to be configured.
 
-> [!ERROR] Note!
-> **Red** cables are used for **IDRAC network**.
+> [!WARNING] Note!
+> **Yellow** cables are used for **iDRAC network**.
 
 ## [Images (click me)](images.md)
 

diff --git a/docs/hardware/aperture/chell.md b/docs/hardware/aperture/chell.md
@@ -8,7 +8,7 @@ tags:
   - chell
   - details
 created: 2023-12-04T22:28:41
-modified: 2024-03-13T04:49:14
+modified: 2026-06-02T00:00:00
 title: Chell
 ---
 
@@ -27,7 +27,9 @@ Part of [aperture](index.md)
 ## Where to Find
 
 - **Internal**:
-	- `10.10.0.6`
+    - `10.10.10.6`
+    - `10.10.30.6`
+    - `10.10.40.6`
 - **External**:
 	- `136.206.16.6`
 	- `chell.redbrick.dcu.ie`

diff --git a/docs/hardware/aperture/glados.md b/docs/hardware/aperture/glados.md
@@ -9,7 +9,7 @@ tags:
   - glados
   - details
 created: 2023-12-04T22:28:41
-modified: 2024-03-13T04:49:14
+modified: 2026-06-02T00:00:00
 title: GlaDOS
 ---
 
@@ -28,7 +28,9 @@ Part of [aperture](index.md)
 ## Where to Find
 
 - **Internal**:
-	- `10.10.0.4`
+    - `10.10.10.4`
+    - `10.10.30.4`
+    - `10.10.40.4`
 - **External**:
 	- `136.206.16.4`
 	- `glados.redbrick.dcu.ie`

diff --git a/docs/hardware/aperture/johnson.md b/docs/hardware/aperture/johnson.md
diff --git a/docs/hardware/aperture/wheatley.md b/docs/hardware/aperture/wheatley.md
@@ -8,7 +8,7 @@ tags:
   - wheatley
   - details
 created: 2023-12-04T22:28:41
-modified: 2024-03-13T04:49:14
+modified: 2026-06-02T00:00:00
 title: Wheatley
 ---
 
@@ -27,7 +27,9 @@ Part of [aperture](index.md)
 ## Where to Find
 
 - **Internal**:
-	- `10.10.0.5`
+    - `10.10.10.5`
+    - `10.10.30.5`
+    - `10.10.40.5`
 - **External**:
 	- `136.206.16.5`
 	- `wheatley.redbrick.dcu.ie`

diff --git a/docs/hardware/azazel.md b/docs/hardware/azazel.md
diff --git a/docs/hardware/index.md b/docs/hardware/index.md
@@ -14,29 +14,30 @@ Here is a list of current hardware in Redbrick's suite of servers, switches and
 
 ## [Login](../services/servers.md#Logging%20in) Boxes
 
-- [**`azazel`**](azazel.md)
-- [**`pygmalion`**](pygmalion.md)
-
-## [NixOS](../procedures/nixos.md) Boxes
-
-- [**`hardcase`**](nix/hardcase.md)
-- [**`motherlode`**](nix/motherlode.md)
-- [**`icarus`**](nix/icarus.md)
-
-- [**`paphos`**](paphos.md)
-- [**`zeus`**](zeus.md)
+- [**`Callisto`**](login/callisto.md)
+- [**`Europa`**](login/europa.md)
 
 ## [Aperture](aperture/index.md)
 
 - [**`glados`**](aperture/glados.md)
 - [**`wheatley`**](aperture/wheatley.md)
 - [**`chell`**](aperture/chell.md)
-- [**`johnson`**](aperture/johnson.md)
-- [**`bastion-vm`**](../services/bastion-vm.md)
+
+## Storage Boxes
+- [**`Mirage`**](storage/mirage.md)
+- [**`Anubis`**](storage/anubis.md)
+
+# Infrastructure Hardware
+- [**`Habibi`**](infrastructure/habibi.md)
+- [**`Pygmalion`**](infrastructure/pygmalion.md)
 
 ## Network Hardware
 
-- [**`arse`**](network/arse.md)
-- [**`cerberus`**](network/cerberus.md)
 - [**`mordor`**](network/mordor.md)
-- [**switches**](network/switches.md)
+- [**`Isengard`**](network/isengard.md)
+- [**`Rivendell`**](network/rivendell.md)
+- [**`Arse`**](network/arse.md)
+
+## Power Hardware
+- [**`Applejack`**](power/applejack.md)
+- [**`Rainbowdash`**](power/rainbowdash.md)
diff --git a/docs/hardware/infrastructure/habibi.md b/docs/hardware/infrastructure/habibi.md
@@ -0,0 +1,8 @@
+---
+id: habibi
+aliases: []
+tags: []
+created: 2026-06-16T19:17:25
+modified: 2026-06-16T19:17:25
+title: Habibi
+---
diff --git a/docs/hardware/infrastructure/pygmalion.md b/docs/hardware/infrastructure/pygmalion.md
@@ -0,0 +1,8 @@
+---
+id: pygmalion
+aliases: []
+tags: []
+created: 2026-06-16T19:17:25
+modified: 2026-06-16T19:17:25
+title: Pygmalion
+---
diff --git a/docs/hardware/login/callisto.md b/docs/hardware/login/callisto.md
@@ -0,0 +1,42 @@
+---
+id: callisto
+aliases:
+  - Callisto
+tags:
+  - hardware
+  - login
+  - details
+created: 2026-06-06T00:00:00
+modified: 2026-06-06T00:00:00
+title: Callisto
+---
+
+
+# Callisto
+
+## Details
+![Fastfetch of login box](https://wiki.redbrick.dcu.ie/images/thumb/3/34/Callisto_fetch.png/700px-Callisto_fetch.png)
+
+**Type**: Dell PowerEdge R730
+**OS**: Debian 13 (trixie)
+**CPU**: 2 x Intel(R) Xeon(R) E5-2687W v3 (40) @ 3.50 GHz
+**RAM**: 256GB
+**Storage**: Onboard RAID controller
+**Disks**: 2x 300Gb SAS Disks (RAID 1)
+**Network**: 2x Gigabit Ethernet, 2x 10 Gigabit SPF+
+
+## Description
+One of our new login boxes setup in Summer 2026. Named after the moon of Jupiter. Donated to us by Susquehanna along with 7 other machines in August 2025.
+
+Callisto is a twin of [Europa](./europa.md).
+
+## Where to Find
+- **Internal**:
+    - `10.10.20.25`
+    - `10.10.30.25`
+    - `10.10.40.25`
+- **External**:
+    - `136.206.16.25`
+
+
+![Callisto](https://img.redbrick.dcu.ie/1000x200/https://cdn.redbrick.dcu.ie/docs/res/callisto.jpg)
diff --git a/docs/hardware/login/europa.md b/docs/hardware/login/europa.md
@@ -0,0 +1,42 @@
+---
+id: europa
+aliases:
+  - Europa
+tags:
+  - hardware
+  - login
+  - details
+created: 2026-06-06T00:00:00
+modified: 2026-06-06T00:00:00
+title: Europa
+---
+
+
+# Europa
+
+## Details
+![Fastfetch of login box](https://wiki.redbrick.dcu.ie/images/thumb/2/20/Europa_fetch.png/700px-Europa_fetch.png)
+
+**Type**: Dell PowerEdge R730
+**OS**: Debian 13 (trixie)
+**CPU**: 2 x Intel(R) Xeon(R) E5-2687W v3 (40) @ 3.50 GHz
+**RAM**: 256GB
+**Storage**: Onboard RAID controller
+**Disks**: 2x 300Gb SAS Disks (RAID 1)
+**Network**: 2x Gigabit Ethernet, 2x 10 Gigabit SPF+
+
+## Description
+One of our new login boxes setup in Summer 2026. Named after the moon of Jupiter. Donated to us by Susquehanna along with 7 other machines in August 2025.
+
+Europa is a twin of [Callisto](./callisto.md).
+
+## Where to Find
+- **Internal**:
+    - `10.10.20.24`
+    - `10.10.30.24`
+    - `10.10.40.24`
+- **External**:
+    - `136.206.16.24`
+
+
+![Europa](https://img.redbrick.dcu.ie/1000x200/https://cdn.redbrick.dcu.ie/docs/res/europa.jpg)
diff --git a/docs/hardware/network/arse.md b/docs/hardware/network/arse.md
@@ -5,4 +5,4 @@ tags: []
 created: 2024-03-01T21:17:25
 modified: 2024-03-01T21:17:25
 title: Arse
----
+---
diff --git a/docs/hardware/network/cerberus.md b/docs/hardware/network/cerberus.md