Merge pull request #6 from alexkar598/refactor

Reorganizes project
tgstation-operations · Feb 18, 2025 · 8fd93fc · 8fd93fc
2 parents a2b2baa + abb4a40
commit 8fd93fc
Show file tree

Hide file tree

Showing 139 changed files with 405 additions and 517 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,6 @@
+root = true
+
+[*.nix]
+tab_width = 2
+indent_size = 2
+indent_style = space
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -2,7 +2,7 @@
 
 **/haproxy @RigglePrime
 /modules/ssh_keys.nix @RigglePrime
-/modules/redbot @RigglePrime
-/modules/monitoring/relay-nodes.nix @RigglePrime
-/nixos_systems/haproxy_byond_global.conf @RigglePrime
-/nixos_systems/haproxy_relay_global.conf @RigglePrime
+/systems/game-servers/systems/tgsatan/modules/redbot.nix @RigglePrime
+/systems/game-servers/systems/tgsatan/modules/monitoring/relay-nodes.nix @RigglePrime
+/systems/game-servers/modules/haproxy_base/haproxy.conf @RigglePrime
+/systems/edge-nodes/modules/haproxy_base/haproxy.conf @RigglePrime
diff --git a/README.md b/README.md
@@ -5,6 +5,31 @@ This repository holds the IaC Config for the /tg/station Space Station 13 Server
 
 This place is not a place of honor... no highly esteemed deed is commemorated here... nothing valued is here.
 
+# Repository structure
+```
+<blorbo_name> = placeholder for the name of a blorbo
+[/root/some/path] = this folder follows the same structure as /root/some/path 
+
+root/
+|-  modules/
+|   |-  <single_file_module_name>.nix
+|   |-  <module_name>/
+|   |   |-  <file_name>
+|   |   |-  default.nix
+|-  secrets/
+|   |-  secrets.nix
+|   |-  <secret_name>.age
+|-  systems/
+|   |-  <system_name>/
+|   |   |-  default.nix
+|   |   |-  modules/ [root/modules]
+|   |   |-  secrets/ [root/secrets]
+|   |-  <system_group_name>/
+|   |   |-  modules/ [root/modules]
+|   |   |-  secrets/ [root/secrets]  
+|   |   |-  systems/ [root/systems]  
+``` 
+
 # Flow of byond packets through infrastructure
 ```mermaid
 architecture-beta

diff --git a/flake.nix b/flake.nix
@@ -80,8 +80,8 @@
         ++ [
           inputs.impermanence.nixosModules.impermanence
           (import ./modules/base.nix)
-          (import ./users)
-          (import ./nixos_systems/tgsatan)
+          (import ./modules/users)
+          (import ./systems/game-servers/systems/tgsatan)
         ];
     };
 
@@ -94,8 +94,8 @@
         flakeModules
         ++ [
           (import ./modules/base.nix)
-          (import ./users)
-          (import ./nixos_systems/vpn.nix)
+          (import ./modules/users)
+          (import ./systems/vpn)
         ];
     };
 
@@ -111,8 +111,8 @@
         flakeModules
         ++ [
           (import ./modules/base.nix)
-          (import ./users)
-          (import ./nixos_systems/relay-node/us/dallas.nix)
+          (import ./modules/users)
+          (import ./systems/edge-nodes/systems/us-dallas.nix)
         ];
     };
 
@@ -128,8 +128,8 @@
         flakeModules
         ++ [
           (import ./modules/base.nix)
-          (import ./users)
-          (import ./nixos_systems/relay-node/us/chicago.nix)
+          (import ./modules/users)
+          (import ./systems/edge-nodes/systems/us-chicago.nix)
         ];
     };
 
@@ -145,8 +145,8 @@
         flakeModules
         ++ [
           (import ./modules/base.nix)
-          (import ./users)
-          (import ./nixos_systems/relay-node/us/atlanta.nix)
+          (import ./modules/users)
+          (import ./systems/edge-nodes/systems/us-atlanta.nix)
         ];
     };
 
@@ -160,8 +160,8 @@
         ++ [
           inputs.impermanence.nixosModules.impermanence
           (import ./modules/base.nix)
-          (import ./users)
-          (import ./nixos_systems/blockmoths)
+          (import ./modules/users)
+          (import ./systems/game-servers/systems/blockmoths)
         ];
     };
     wiggle = {
@@ -176,8 +176,8 @@
         flakeModules
         ++ [
           (import ./modules/base.nix)
-          (import ./users)
-          (import ./nixos_systems/staging/wiggle)
+          (import ./modules/users)
+          (import ./systems/game-servers/systems/staging)
         ];
     };
     warsaw = {
@@ -192,8 +192,8 @@
         flakeModules
         ++ [
           (import ./modules/base.nix)
-          (import ./users)
-          (import ./nixos_systems/relay-node/staging/warsaw.nix)
+          (import ./modules/users)
+          (import ./systems/edge-nodes/systems/staging)
         ];
     };
     lime = {
@@ -208,8 +208,8 @@
         flakeModules
         ++ [
           (import ./modules/base.nix)
-          (import ./users)
-          (import ./nixos_systems/relay-node/us/lime.nix)
+          (import ./modules/users)
+          (import ./systems/edge-nodes/systems/us-lime.nix)
         ];
     };
     bratwurst = {
@@ -225,8 +225,8 @@
         flakeModules
         ++ [
           (import ./modules/base.nix)
-          (import ./users)
-          (import ./nixos_systems/relay-node/eu/bratwurst.nix)
+          (import ./modules/users)
+          (import ./systems/edge-nodes/systems/eu-bratwurst.nix)
         ];
     };
     dachshund = {
@@ -242,8 +242,8 @@
         flakeModules
         ++ [
           (import ./modules/base.nix)
-          (import ./users)
-          (import ./nixos_systems/relay-node/eu/dachshund.nix)
+          (import ./modules/users)
+          (import ./systems/edge-nodes/systems/eu-dachshund.nix)
         ];
     };
     knipp = {
@@ -259,8 +259,8 @@
         flakeModules
         ++ [
           (import ./modules/base.nix)
-          (import ./users)
-          (import ./nixos_systems/relay-node/eu/knipp.nix)
+          (import ./modules/users)
+          (import ./systems/edge-nodes/systems/eu-knipp.nix)
         ];
     };
   in {

diff --git a/modules/forgejo.nix → modules/_retirement_home/forgejo.nix b/modules/forgejo.nix → modules/_retirement_home/forgejo.nix
diff --git a/modules/tts-api/tts-api.nix → modules/_retirement_home/tts-api.nix b/modules/tts-api/tts-api.nix → modules/_retirement_home/tts-api.nix
diff --git a/modules/atticd/secrets/secrets.nix b/modules/atticd/secrets/secrets.nix
diff --git a/modules/garage/secrets/secrets.nix b/modules/garage/secrets/secrets.nix
diff --git a/modules/monitoring/prometheus.nix b/modules/monitoring/prometheus.nix
diff --git a/modules/monitoring/relay-nodes.nix b/modules/monitoring/relay-nodes.nix
diff --git a/modules/ssh_keys.nix b/modules/ssh_keys.nix
@@ -15,4 +15,4 @@ builtins.concatLists
         })
         .users
         .users)
-      ((import ../users/operator) {}).imports)))
+      ((import ./users/operator) {}).imports)))
diff --git a/modules/monitoring/systemd-exporter.nix → modules/systemd-exporter.nix b/modules/monitoring/systemd-exporter.nix → modules/systemd-exporter.nix
diff --git a/modules/tgs/secrets/secrets.nix b/modules/tgs/secrets/secrets.nix
diff --git a/users/bot/default.nix → modules/users/bot/default.nix b/users/bot/default.nix → modules/users/bot/default.nix
diff --git a/users/bot/iamgoofball.nix → modules/users/bot/iamgoofball.nix b/users/bot/iamgoofball.nix → modules/users/bot/iamgoofball.nix
diff --git a/users/default.nix → modules/users/default.nix b/users/default.nix → modules/users/default.nix
diff --git a/users/keyholder/default.nix → modules/users/keyholder/default.nix b/users/keyholder/default.nix → modules/users/keyholder/default.nix
diff --git a/users/keyholder/tg/aa07.nix → modules/users/keyholder/tg/aa07.nix b/users/keyholder/tg/aa07.nix → modules/users/keyholder/tg/aa07.nix
diff --git a/users/keyholder/tg/default.nix → modules/users/keyholder/tg/default.nix b/users/keyholder/tg/default.nix → modules/users/keyholder/tg/default.nix
diff --git a/users/keyholder/tg/mothblocks.nix → modules/users/keyholder/tg/mothblocks.nix b/users/keyholder/tg/mothblocks.nix → modules/users/keyholder/tg/mothblocks.nix
diff --git a/users/keyholder/tg/niknak.nix → modules/users/keyholder/tg/niknak.nix b/users/keyholder/tg/niknak.nix → modules/users/keyholder/tg/niknak.nix
diff --git a/users/keyholder/tg/watermelon.nix → modules/users/keyholder/tg/watermelon.nix b/users/keyholder/tg/watermelon.nix → modules/users/keyholder/tg/watermelon.nix
diff --git a/users/keyholder/tgmc/aiia.nix → modules/users/keyholder/tgmc/aiia.nix b/users/keyholder/tgmc/aiia.nix → modules/users/keyholder/tgmc/aiia.nix
diff --git a/users/keyholder/tgmc/default.nix → modules/users/keyholder/tgmc/default.nix b/users/keyholder/tgmc/default.nix → modules/users/keyholder/tgmc/default.nix
diff --git a/users/operator/alexkar598.nix → modules/users/operator/alexkar598.nix b/users/operator/alexkar598.nix → modules/users/operator/alexkar598.nix
diff --git a/users/operator/default.nix → modules/users/operator/default.nix b/users/operator/default.nix → modules/users/operator/default.nix
diff --git a/users/operator/dominion.nix → modules/users/operator/dominion.nix b/users/operator/dominion.nix → modules/users/operator/dominion.nix
diff --git a/users/operator/iain0.nix → modules/users/operator/iain0.nix b/users/operator/iain0.nix → modules/users/operator/iain0.nix
diff --git a/users/operator/lowrp.nix → modules/users/operator/lowrp.nix b/users/operator/lowrp.nix → modules/users/operator/lowrp.nix
diff --git a/users/operator/ned.nix → modules/users/operator/ned.nix b/users/operator/ned.nix → modules/users/operator/ned.nix
diff --git a/users/operator/oranges.nix → modules/users/operator/oranges.nix b/users/operator/oranges.nix → modules/users/operator/oranges.nix
diff --git a/users/operator/riggle.nix → modules/users/operator/riggle.nix b/users/operator/riggle.nix → modules/users/operator/riggle.nix
diff --git a/users/operator/scriptis.nix → modules/users/operator/scriptis.nix b/users/operator/scriptis.nix → modules/users/operator/scriptis.nix
diff --git a/users/operator/zephyrtfa.nix → modules/users/operator/zephyrtfa.nix b/users/operator/zephyrtfa.nix → modules/users/operator/zephyrtfa.nix
diff --git a/nixos_systems/relay-node/caddy/secrets/secrets.nix b/nixos_systems/relay-node/caddy/secrets/secrets.nix
diff --git a/nixos_systems/relay-node/haproxy/default.nix b/nixos_systems/relay-node/haproxy/default.nix
diff --git a/nixos_systems/relay-node/staging/caddy/secrets/secrets.nix b/nixos_systems/relay-node/staging/caddy/secrets/secrets.nix
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,4 +15,4 @@ builtins.concatLists @@
             })
             .users
             .users)
-          ((import ../users/operator) {}).imports)))
+          ((import ./users/operator) {}).imports)))