From acd21dd27a96991a61cdb8967061c4c27074752b Mon Sep 17 00:00:00 2001 From: Juno Meifert Date: Wed, 23 Oct 2024 15:51:47 -0400 Subject: [PATCH 1/4] Add proposed 145.x layout --- src/infrastructure/network/ip_allocations.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/infrastructure/network/ip_allocations.md b/src/infrastructure/network/ip_allocations.md index d3afc97..2071239 100644 --- a/src/infrastructure/network/ip_allocations.md +++ b/src/infrastructure/network/ip_allocations.md @@ -48,13 +48,21 @@ _updated: December 15, 2023_ | 52 | [Caterpillar](../servers/caterpillar.md) | | 53 | [TalTres](../servers/taltres.md) | | 90 | [Elephant](../servers/elephant.md) | -| 91 | [Erised](../servers/erised.md) | + ### Layout # Layout of 145/24 network -_TODO: reallocate the entire network_ +| 128.153.145.# | Name | +| :--- | :--- +| 1 | OIT Gateway | +| 2-29 | Network services/appliances, Mirror | +| 30-99 | COSI Servers | +| 100-169 | Research | +| 170-220 | Student projects / VMs | +| 230-253 | Research | +| 254 | VPN Server | ## IPv6 Address Listing for 2605:6480:c051::/48 network From f7c560262b4120ea76f4b54a1bd198f55d40b62f Mon Sep 17 00:00:00 2001 From: Juno Meifert Date: Wed, 23 Oct 2024 15:53:19 -0400 Subject: [PATCH 2/4] Fix typo CI failing --- src/websites/book.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/websites/book.md b/src/websites/book.md index 08f7a8a..a054b29 100644 --- a/src/websites/book.md +++ b/src/websites/book.md @@ -14,7 +14,7 @@ What is far more interesting about the book is it's history. ## History -The history of documentation in COSI teaching some interesting lessons. Here is some history on why our previous two methods of documentation eventually fell out of fashion for their maintainablity and transferablity. +The history of documentation in COSI teaching some interesting lessons. Here is some history on why our previous two methods of documentation eventually fell out of fashion for their maintainability and transferablity. **Info Slash** From 566ead0de46d8f83eebcd21423efc5fb29b58845 Mon Sep 17 00:00:00 2001 From: Juno Meifert Date: Wed, 23 Oct 2024 15:56:33 -0400 Subject: [PATCH 3/4] Update DHCP to reflect current setup --- src/infrastructure/network/ip_allocations.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/infrastructure/network/ip_allocations.md b/src/infrastructure/network/ip_allocations.md index 2071239..f59c78a 100644 --- a/src/infrastructure/network/ip_allocations.md +++ b/src/infrastructure/network/ip_allocations.md @@ -14,7 +14,7 @@ _updated: December 15, 2023_ | 21-28 | COSI Machines (1-8) | | 29 | 3D Printer Machine | | 40-65 | ITL Machines | -| 100-254 | DHCP | +| 100-250 | DHCP | ### Layout @@ -26,7 +26,9 @@ _updated: December 15, 2023_ | 21-39 | COSI Machines | | 40-65 | ITL Machines | | 66-99 | Unallocated | -| 100-254 | DHCP | +| 100-250 | DHCP | +| 251-253 | Unallocated | +| 254 | VPN Entry Point | ## IP Address Listing for 128.153.145.1/24 subnet @@ -61,8 +63,7 @@ _updated: December 15, 2023_ | 30-99 | COSI Servers | | 100-169 | Research | | 170-220 | Student projects / VMs | -| 230-253 | Research | -| 254 | VPN Server | +| 230-254 | Research | ## IPv6 Address Listing for 2605:6480:c051::/48 network From 5265334908f219714b09cdbaf9d5b5fb0716e9d0 Mon Sep 17 00:00:00 2001 From: "Anthony J. Halliday" Date: Thu, 24 Oct 2024 12:07:04 -0400 Subject: [PATCH 4/4] Unify formatting of sections Cleaned up each subnet section to have uniform formatting --- src/infrastructure/network/ip_allocations.md | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/infrastructure/network/ip_allocations.md b/src/infrastructure/network/ip_allocations.md index f59c78a..6efa91f 100644 --- a/src/infrastructure/network/ip_allocations.md +++ b/src/infrastructure/network/ip_allocations.md @@ -2,9 +2,9 @@ All links on this page should point at the underlying physical (or virtual) _infrastructure_. Links do **not** redirect towards _services_. -## IP Address Listing for 128.153.144.1/24 subnet - -_updated: December 15, 2023_ +## 128.153.144.0/24 Subnet +### IP Address Listing +_updated: October 24, 2024_ | 128.153.144.# | Name | | :--- | :--- @@ -30,7 +30,9 @@ _updated: December 15, 2023_ | 251-253 | Unallocated | | 254 | VPN Entry Point | -## IP Address Listing for 128.153.145.1/24 subnet +## 128.153.145.0/24 Subnet +### IP Address Listing +_updated: October 24, 2024_ | 128.153.145.# | Name | | :--- | :--- @@ -51,10 +53,7 @@ _updated: December 15, 2023_ | 53 | [TalTres](../servers/taltres.md) | | 90 | [Elephant](../servers/elephant.md) | - -### Layout - -# Layout of 145/24 network +### Allocations | 128.153.145.# | Name | | :--- | :--- @@ -65,9 +64,9 @@ _updated: December 15, 2023_ | 170-220 | Student projects / VMs | | 230-254 | Research | -## IPv6 Address Listing for 2605:6480:c051::/48 network +## 2605:6480:c051::/48 Subnet -### Subnet Allocations +### Allocations | 2605:6480:c051 | :XXXX: | YYYY:YYYY:YYYY:YYYY | | :-: | :-: | :-: |