Caterpillar + TalTres, housekeeping (#39)

Merging with spelling error, will fix

src/SUMMARY.md

@@ -14,6 +14,7 @@
 - [Racks](./infrastructure/racks.md)
 
 - [Servers](./infrastructure/servers/index.md)
+    - [Caterpillar](./infrastructure/servers/caterpillar.md)
     - [Bacon](./infrastructure/servers/bacon.md)
     - [Elephant](./infrastructure/servers/elephant.md)
   	- [Eldwyn](./infrastructure/servers/eldwyn.md)
@@ -23,7 +24,7 @@
     - [Janet](./infrastructure/servers/janet.md)
     - [Kasper](./infrastructure/servers/kasper.md)
     - [Talos](./infrastructure/servers/talos.md)
-    - [TalDos](./infrastructure/servers/taldos.md)
+    - [TalTres](./infrastructure/servers/taltres.md)
     - [Tiamat](./infrastructure/servers/tiamat.md)
     - [Wallace](./infrastructure/servers/wallace.md)
     - [Ziltoid](./infrastructure/servers/ziltoid.md)

src/infrastructure/network/ip_allocations.md

@@ -34,17 +34,21 @@ _updated: December 15, 2023_
 | :--- | :---
 | 1 | OIT Gateway |
 | 2 | [Kasper](../servers/kasper.md) |
-| 3 | [TalDos](../servers/taldos.md) |
-| 4 | [Talos](../servers/talos.md) |
+| 3 | [TalTres](../servers/taltres.md) |
+| 5 | [Ziltoid](../servers/ziltoid.md) |
+| 10 | [Bacon](../servers/bacon.md) |
+| 19 | [Mirror](../../mirror/introduction.md) |
+| 20 | [FCOLO](../network/switches.md) |
+| 20 | [FHILL](../network/switches.md) |
 | 38 | [Wallace](../servers/wallace.md) |
 | 39 | [Gromit](../servers/gromit.md) |
 | 41 | [Tiamat](../servers/tiamat.md) |
 | 42 | [Hydra](../servers/hydra.md) |
 | 43 | [Janet](../servers/janet.md) |
-| 53 | [TalDos](../servers/taldos.md) |
+| 52 | [Caterpillar](../servers/caterpillar.md) |
+| 53 | [TalTres](../servers/taltres.md) |
 | 90 | [Elephant](../servers/elephant.md) |
-| 179 | [hbox](../servers/hbox.md) |
-
+| 91 | [Erised](../servers/erised.md) |
 
 ### Layout
 

src/infrastructure/servers/taldos.md → src/infrastructure/servers/caterpillar.md

@@ -1,8 +1,8 @@
-# TalDos
+# Caterpillar
 
-_updated: November 27, 2023_
+_updated: September 15, 2024_
 
-TalDos is COSI's primary DNS server, replacing Talos.
+Caterpillar (formerly TalDos) is COSI's jump server. The only thing running on it is an SSH server.
 
 | | |
 | :--- | :--- |
@@ -25,14 +25,13 @@ TalDos is COSI's primary DNS server, replacing Talos.
 | :--- | :--- |
 | OS | GNU/Linux
 | Distro | Debian 12 Bookworm
-| Last updated | Nov 2023
+| Last updated | Sep 2024
 | End of life | unknown
 | Enrolled in COSI auth | false
 | NFS Mount | false
 
 ## Services
 
-[Authoritative DNS](../../services/authoritative_dns.md)
-[DHCP](../../services/dhcp.md)
+SSH
 
 ## Notes

src/infrastructure/servers/index.md

@@ -18,7 +18,7 @@ This chapter contains an alphabetically ordered list of all of COSI's physical s
 | Janet       | 2    | Xeon E5-2640     | 6/12          | 6325       | 80 GB DDR3    |
 | Kasper      | 1    | Xeon E5-2620     | 6/12          | 5290       | 8 GB DDR3     |
 | Mirror      | 2    | Xeon E5504       | 4/4           | 1519       | 64 GB DDR3    |
-| TalDos      | 2    | Xeon E5620       | 4/8           | 3502       | 12 GB DDR3    |
+| Caterpillar | 2    | Xeon E5620       | 4/8           | 3502       | 12 GB DDR3    |
 | Talos       | 1    | Xeon E3-1220v2   | 4/4           | 4666       | 4 GB DDR3     |
 | Tiamat      | 2    | Opteron 6220     | 8/8           | 4753       | 64 GB DDR3    |
 | Wallace     | 2    | Xeon E5-2697v3   | 14/28         | 18717      | 128 GB DDR4   |

src/infrastructure/servers/talos.md

@@ -41,4 +41,4 @@ Kerberos
 
 ## Notes
 
-Talos was replaced by TalDos in Fall 2023 after it crashed due to memory errors.
+Talos was replaced by Caterpillar (formerly TalDos) in Fall 2023 after it crashed due to memory errors.

src/infrastructure/servers/taltres.md

@@ -0,0 +1,41 @@
+# TalTres
+
+_updated: September 15, 2024_
+
+TalTres is COSI's primary DNS server, replacing TalDos (now Caterpillar).
+It also runs our point-to-site VPN.
+
+*Third time's the charm.*
+
+| | |
+| :--- | :--- |
+| Location | [Server Room - Network 1](../racks.md#network-1) |
+| IP Addresses | 128.153.145.3, 128.153.145.53 |
+| Deployed | true |
+
+## Hardware
+
+| | |
+| :--- | :--- |
+| CPU | Intel Xeon E5-2640v3 (x2)
+| RAM | 64 GB
+| STORAGE | 2.4 TB
+| CONNECTIVITY | 1 Gbps
+
+## Operating System
+
+| | |
+| :--- | :--- |
+| OS | GNU/Linux
+| Distro | Debian 12 Bookworm
+| Last updated | Sep 2024
+| End of life | Not yet announced
+| Enrolled in COSI auth | false
+| NFS Mount | false
+
+## Services
+
+[Authoritative DNS](../../services/authoritative_dns.md)
+[DHCP](../../services/dhcp.md)
+
+## Notes

src/infrastructure/vms.md

@@ -32,7 +32,7 @@ _updated: Sept 18th 2022_
 
 ## atlas
 
-> deprecated: All DNS is handled by [TalDos](./servers/taldos.md).
+> deprecated: All DNS is handled by [TalTres](./servers/taltres.md).
 
 _updated: December 15th, 2023_
 

src/services/authoritative_dns.md

@@ -21,7 +21,7 @@ When adding a new server to the network make sure you remember to add it's ip to
 
 ## NSD
 
-COSI has one authoritative DNS server running [NSD](https://en.wikipedia.org/wiki/NSD) which is `dns1.cosi.clarkson.edu` is running on [Taldos](../infrastructure/servers/taldos.md). 
+COSI has one authoritative DNS server running [NSD](https://en.wikipedia.org/wiki/NSD) which is `dns1.cosi.clarkson.edu` is running on [TalTres](../infrastructure/servers/taltres.md). 
 
 OIT's caching DNS servers are configured to cache the entire zone files over XFR. That is why we have XFR enabled for OIT's name servers. If you notice DNS results are buggy within the Clarkson network it is probably this.
 

src/services/dhcp.md

@@ -6,7 +6,7 @@ Since COSI has it's own network we also run a [DHCP](https://en.wikipedia.org/wi
 
 ## Kea
 
-We have a single dhcp server running on [TalDos](../infrastructure/servers/taldos.md).
+We have a single dhcp server running on [TalTres](../infrastructure/servers/taltres.md).
 In the past we had a fallback server running in a VM. This no longer exists.
 We currently use Internet Systems Consortium's Kea DHCP server.
 

src/services/recursive_dns.md

@@ -34,7 +34,7 @@ dns2: 8.8.4.4
 
 We currently use [Unbound](https://en.wikipedia.org/wiki/Unbound_(DNS_server)) for DNS. If possible, other clients should do their best to have their own DNS caches to further decrease latency when repeatedly accessing the same sites. 
 
-Unbound is currently running on [TalDos](../infrastructure/servers/taldos.md).
+Unbound is currently running on [TalTres](../infrastructure/servers/taltres.md).
 
 ### Configuration
 ```