feat!: Rename a1d1 -> teal
We're calling systems by names that we believe are better for tailscale,
and one thing that came up was confusion between different but similar
number combinations. As it stands, we'll now be using colors for devices
and letters (with their phonetic alphabet words) as areas
Change-Id: I8f80042dfe3b9520b33b1063ed9be76ac96a74c9
Reviewed-on: https://git.clicks.codes/c/Infra/NixFiles/+/741
Reviewed-by: Samuel Shuert <coded@clicks.codes>
Tested-by: Skyler Grey <minion@clicks.codes>
diff --git a/.sops.nix b/.sops.nix
index 78271c5..658417a 100644
--- a/.sops.nix
+++ b/.sops.nix
@@ -12,20 +12,20 @@
};
hosts = {
# nix run github:Mic92/ssh-to-pgp -- -i /etc/ssh/ssh_host_rsa_key
- a1d1 = "67c66d58ac73fd744c2b49720f026aad93752d6a";
+ teal = "67c66d58ac73fd744c2b49720f026aad93752d6a";
};
};
in
{
creation_rules = [
{
- path_regex = ''.*\/a1d1\/.*\.sops\.(yaml|json|env|ini|([^.]\.)*bin)$'';
+ path_regex = ''.*\/teal\/.*\.sops\.(yaml|json|env|ini|([^.]\.)*bin)$'';
pgp = nixpkgs.lib.concatStringsSep "," [
keys.users.coded
keys.users.minion
keys.users.pinea
- keys.hosts.a1d1
+ keys.hosts.teal
];
}
];
diff --git a/README.md b/README.md
index c7f2a0b..9725dcb 100644
--- a/README.md
+++ b/README.md
@@ -15,14 +15,14 @@
## Systems
-`a` stands for "area", `d` stands for "device". So for example, `a1d1` is device 1 in area 1. Areas are generally
-managed by one member of Clicks, who has full access to all of the servers in that area. If you require help for a
-specific area you can email `admin@clicks.codes` and in the subject line include the area you want help for.
+Devices are named after colors, areas are named as a letter, with the matching phonetic alphabet word. Areas are
+generally managed by one member of Clicks, who has full access to all of the servers in that area. If you require help
+for a specific area you can email `admin@clicks.codes` and in the subject line include the area you want help for.
-| System | Description | Address |
-| --------------------------------------------------- | ------------------------------------------------------------- | ----------------------- |
-| [a1d1](./systems/x86_64-linux/a1d1/default.nix) | Primary Host | `d1.a1.clicks.domains` |
-| [a1d2](./systems/x86_64-linux/a1d2/default.nix) | Build Server | `d2.a1.clicks.domains` |
+| System | Description | Address |
+| --------------------------------------------------- | ------------------------------------------------------------- | ---------------------------- |
+| [teal](./systems/x86_64-linux/teal/default.nix) | Primary Host | `teal.alpha.clicks.domains` |
+| [a1d2](./systems/x86_64-linux/a1d2/default.nix) | Build Server | `d2.a1.clicks.domains` |
## Deploying
diff --git a/systems/x86_64-linux/a1d1/default.nix b/systems/x86_64-linux/teal/default.nix
similarity index 100%
rename from systems/x86_64-linux/a1d1/default.nix
rename to systems/x86_64-linux/teal/default.nix
diff --git a/systems/x86_64-linux/a1d1/headscale.sops.json b/systems/x86_64-linux/teal/headscale.sops.json
similarity index 100%
rename from systems/x86_64-linux/a1d1/headscale.sops.json
rename to systems/x86_64-linux/teal/headscale.sops.json
diff --git a/systems/x86_64-linux/a1d1/headscale.sops.json.license b/systems/x86_64-linux/teal/headscale.sops.json.license
similarity index 100%
rename from systems/x86_64-linux/a1d1/headscale.sops.json.license
rename to systems/x86_64-linux/teal/headscale.sops.json.license