redbrick · Arisamiga · Jun 1, 2026 · Jun 1, 2026 · Jun 2, 2026 · Jun 2, 2026
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,22 @@
+FROM python:3.12-slim
+
+WORKDIR /app
+
+# Install system dependencies required for Git plugin and Material imaging features
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    git \
+    gcc \
+    python3-dev \
+    zlib1g-dev \
+    libjpeg-dev \
+    libfreetype6-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+# Copy and install Python requirements
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+
+EXPOSE 8000
+
+# Fire up ProperDocs from the root app directory
+CMD ["properdocs", "serve", "--dev-addr=0.0.0.0:8000"]
diff --git a/docs/contact.md b/docs/contact.md
@@ -10,6 +10,6 @@ title: Contact Us
 
 # Contact Us
 
-If you have any questions or comments, please contact us at [elected-admins@redbrick.dcu.ie](mailto:elected-admins@redbrick.dcu.ie). Or you can join the [Discord server](https://discord.gg/MttnTq9UyK)!
+If you have any questions or comments, please contact us at [elected-admins@redbrick.dcu.ie](mailto:elected-admins@redbrick.dcu.ie). Or you can create a ticket on the [Discord server](https://discord.redbrick.dcu.ie)!
 
 <iframe src="https://discord.com/widget?id=568403963595063307&theme=dark" width="100%" height="600" allowtransparency="true" frameborder="0" sandbox="allow-popups allow-popups-to-escape-sandbox allow-same-origin allow-scripts"></iframe>
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,55 +18,31 @@ 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`
-
 ## Servers
 
-The three servers are named [`glados`](glados.md) , [`wheatley`](wheatley.md) and [`chell`](chell.md).
+The three servers are named [`glados`](glados.md), [`wheatley`](wheatley.md) and [`chell`](chell.md).
 
 ## 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`. This is used to directly access the machines from the server room.
 
-[`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.
+The new servers are all equipped with IDRACs. These are configured for access through the vpn. The ips assigned for these are a bit all over the place
+so you need to find it on mordor.
 
-> [!ERROR] Note!
-> **Red** cables are used for **IDRAC network**.
+> [!WARNING] Note!
+> **Yellow** cables are used for **iDRAC network**.
 
 ## [Images (click me)](images.md)
-
-## Switching from the Old Network to the New
-
-We have two address ranges that come in on a single redundant link, so we're exchanging that redundant link for two separate links, each taking responsibility for an address range (`136.26.15.0/24` and `136.206.16.0/24`). So we're surrendering redundancy to gain uptime/connectivity during the switchover only. Once the new servers are production ready, we can recombine the link to regain the redundancy.
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
 ---
 
@@ -17,17 +17,18 @@ title: Chell
 ## Details
 
 - **Type**: Dell R6515
-- **OS**: Debian 11
+- **OS**: Debian 12
 - **CPU**: AMD 7302P 3GHz, 16C/32T, 128M, 155W
-- **RAM**: 2x 16GB RDIMM, 3200MT/s Dual Rank
+- **RAM**: 16x 64GB RDIMM, 3200MT/s Dual Rank
 - **Storage**: 4x 2TB SATA HDDs (hardware RAID)
 
 Part of [aperture](index.md)
 
 ## Where to Find
 
 - **Internal**:
-	- `10.10.0.6`
+    - `10.10.10.6`
+    - `10.10.30.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
 ---
 
@@ -18,17 +18,18 @@ title: GlaDOS
 ## Details
 
 - **Type**: Dell R6515
-- **OS**: Debian 11
+- **OS**: Debian 12
 - **CPU**: AMD 7302P 3GHz, 16C/32T, 128M, 155W
-- **RAM**: 2x 16GB RDIMM, 3200MT/s Dual Rank
+- **RAM**: 16x 64GB RDIMM, 3200MT/s Dual Rank
 - **Storage**: 4x 2TB SATA HDDs (hardware RAID)
 
 Part of [aperture](index.md)
 
 ## Where to Find
 
 - **Internal**:
-	- `10.10.0.4`
+    - `10.10.10.4`
+    - `10.10.30.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
 ---
 
@@ -17,17 +17,18 @@ title: Wheatley
 ## Details
 
 - **Type**: Dell R6515
-- **OS**: Debian 11
+- **OS**: Debian 12
 - **CPU**: AMD 7302P 3GHz, 16C/32T, 128M, 155W
-- **RAM**: 2x 16GB RDIMM, 3200MT/s Dual Rank
+- **RAM**: 16x 64GB RDIMM, 3200MT/s Dual Rank
 - **Storage**: 4x 2TB SATA HDDs (hardware RAID)
 
 Part of [aperture](index.md)
 
 ## Where to Find
 
 - **Internal**:
-	- `10.10.0.5`
+    - `10.10.10.5`
+    - `10.10.30.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
+- [**`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,29 @@
+---
+id: habibi
+aliases: []
+tags: []
+created: 2026-06-16T19:17:25
+modified: 2026-06-16T19:17:25
+title: Habibi
+---
+
+# Habibi
+
+## Details
+
+- **Type**: Dell R6515
+- **OS**: Debian 12
+- **CPU**: Intel(R) Xeon(R) CPU E5-2687W v3 @ 3.10GHz
+- **RAM**: 256GB
+- **Storage**: 2x 300GB SATA HDDs (hardware RAID)
+
+Habibi is one of the machines we had donated to us by susquehana. Currently it just runs DNS but that will eventually be moved to aperture and habibi will be used as a backup / fafo box.
+
+## Where to Find
+
+- **Internal**:
+    - `10.10.10.6`
+    - `10.10.30.6`
+- **External**:
+    - `136.206.15.53`
+    - `ns1.redbrick.dcu.ie`