diff --git a/newinfra/nix/hive.nix b/newinfra/nix/hive.nix index 8bda9d8..a838e3c 100644 --- a/newinfra/nix/hive.nix +++ b/newinfra/nix/hive.nix @@ -152,6 +152,7 @@ ''; }; + # VPS1 is the primary app server. vps1 = { name, nodes, modulesPath, config, lib, ... }: { imports = [ (modulesPath + "/profiles/qemu-guest.nix") @@ -171,9 +172,10 @@ ./apps/killua ]; - deployment.tags = [ "ingress" "eu" "apps" "wg" ]; + deployment.tags = [ "ingress" "eu" "apps" ]; system.stateVersion = "23.11"; }; + # VPS3 is the primary monitoring/metrics server. vps3 = { name, nodes, modulesPath, config, ... }: { imports = [ (modulesPath + "/profiles/qemu-guest.nix") @@ -184,9 +186,10 @@ ./modules/prometheus ]; - deployment.tags = [ "eu" "apps" "wg" ]; + deployment.tags = [ "eu" "apps" ]; system.stateVersion = "23.11"; }; + # VPS4 exists. It's useful for garage replication but not much more. vps4 = { lib, modulesPath, ... }: { imports = [ (modulesPath + "/profiles/qemu-guest.nix") @@ -236,6 +239,7 @@ ''; }; + # VPS5 is the primary test server, where new things are being deployed that could break stuff maybe. vps5 = { name, nodes, modulesPath, config, pkgs, ... }: { imports = [ (modulesPath + "/profiles/qemu-guest.nix") @@ -245,7 +249,7 @@ ./modules/garage ]; - deployment.tags = [ "eu" "apps" "wg" ]; + deployment.tags = [ "eu" "apps" ]; system.stateVersion = "23.11"; }; } diff --git a/newinfra/nix/modules/backup/default.nix b/newinfra/nix/modules/backup/default.nix index 787fb53..61ebdb3 100644 --- a/newinfra/nix/modules/backup/default.nix +++ b/newinfra/nix/modules/backup/default.nix @@ -3,7 +3,7 @@ let jobOptions = { ... }: { options = { app = mkOption { - type = types.string; + type = types.str; description = "The app name, used as the directory in the bucket"; }; environmentFile = mkOption { @@ -11,20 +11,20 @@ let default = null; }; file = mkOption { - type = types.nullOr types.string; + type = types.nullOr types.str; default = null; }; pgDump = mkOption { type = types.nullOr (types.submodule ({ ... }: { options = { containerName = mkOption { - type = types.string; + type = types.str; }; dbName = mkOption { - type = types.string; + type = types.str; }; userName = mkOption { - type = types.string; + type = types.str; }; }; }));