[READY] Rename core servers (#1072)

Author: sarcasticadmin

facts/inventory.py

@@ -422,14 +422,14 @@ def serveralias(name):
     """generate aliases for servers. Rendered as CNAMES"""
     payload = []
     match name.lower():
-        case "core-slave":
+        case "core-expo":
             payload = [
-                "coreexpo",
+                "core-slave",
                 "ntpexpo",
             ]
-        case "core-master":
+        case "core-conf":
             payload = [
-                "coreconf",
+                "core-master",
                 "loghost",
                 "monitoring",
                 "ntpconf",

facts/servers/serverlist.csv

@@ -1,6 +1,6 @@
 name,mac-address,ipv6,ipv4,role
-core-slave,58:9c:fc:00:38:5f,2001:470:f026:103::20,10.0.3.20,core
-core-master,4c:72:b9:7c:41:17,2001:470:f026:503::20,10.128.3.20,core
+core-expo,58:9c:fc:00:38:5f,2001:470:f026:103::20,10.0.3.20,core
+core-conf,4c:72:b9:7c:41:17,2001:470:f026:503::20,10.128.3.20,core
 mrtg,52:54:00:d4:fa:5d,2001:470:f026:503::21,10.128.3.21,mrtg
 ctfweb,52:54:00:31:a4:fa,2001:470:f026:503::22,10.128.3.22,ctfweb
 wireguard,52:54:00:61:c6:f9,2001:470:f026:103::23,10.0.3.23,wireguard

nix/README.md

@@ -20,11 +20,16 @@ You can see all the system configurations available by running the following.
 
 ```shell-session
 > nix flake show --json 2>/dev/null | jq '.nixosConfigurations | keys.[]'
-"bootstrapImage"
-"coreMaster"
-"coreSlave"
-"devServer"
-"massflash"
+"bootstrap-image"
+"core-conf"
+"core-expo"
+"dev-server"
+"massflash-pi"
+"massflash-x86"
+"router-border"
+"router-conf"
+"router-expo"
+"router-scale-br-fmt2"
 ```
 
 ## Build and Run a VM Locally

…igurations/core-master/configuration.nix …nfigurations/core-conf/configuration.nixnix/nixos-configurations/core-master/configuration.nix renamed to nix/nixos-configurations/core-conf/configuration.nix nix/nixos-configurations/core-master/configuration.nix renamed to nix/nixos-configurations/core-conf/configuration.nix

@@ -33,7 +33,7 @@
         #  https://github.com/NixOS/nixpkgs/blob/82935bfed15d680aa66d9020d4fe5c4e8dc09123/nixos/tests/systemd-networkd-dhcpserver.nix
         networking = {
           extraHosts = ''
-            10.128.3.20 core-master.scale.lan
+            10.128.3.20 core-conf.scale.lan
           '';
         };
 

…s-configurations/core-master/default.nix …xos-configurations/core-conf/default.nixnix/nixos-configurations/core-master/default.nix renamed to nix/nixos-configurations/core-conf/default.nix nix/nixos-configurations/core-master/default.nix renamed to nix/nixos-configurations/core-conf/default.nix

@@ -33,7 +33,7 @@
         #  https://github.com/NixOS/nixpkgs/blob/82935bfed15d680aa66d9020d4fe5c4e8dc09123/nixos/tests/systemd-networkd-dhcpserver.nix
         networking = {
           extraHosts = ''
-            10.0.3.20 core-slave.scale.lan
+            10.0.3.20 core-expo.scale.lan
           '';
         };