Noratrieb/vps
1
0
Fork 0
mirror of https://github.com/Noratrieb/vps.git synced 2026-01-14 16:55:00 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
nora 2024-08-08 17:08:02 +02:00
parent fc57e4cc92
commit 775b85031e
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
newinfra/nix/hive.nix
View file

@ -152,6 +152,7 @@
''; '';
}; };
# VPS1 is the primary app server.
vps1 = { name, nodes, modulesPath, config, lib, ... }: { vps1 = { name, nodes, modulesPath, config, lib, ... }: {
imports = [ imports = [
(modulesPath + "/profiles/qemu-guest.nix") (modulesPath + "/profiles/qemu-guest.nix")
@ -171,9 +172,10 @@
./apps/killua ./apps/killua
]; ];
deployment.tags = [ "ingress" "eu" "apps" "wg" ]; deployment.tags = [ "ingress" "eu" "apps" ];
system.stateVersion = "23.11"; system.stateVersion = "23.11";
}; };
# VPS3 is the primary monitoring/metrics server.
vps3 = { name, nodes, modulesPath, config, ... }: { vps3 = { name, nodes, modulesPath, config, ... }: {
imports = [ imports = [
(modulesPath + "/profiles/qemu-guest.nix") (modulesPath + "/profiles/qemu-guest.nix")
@ -184,9 +186,10 @@
./modules/prometheus ./modules/prometheus
]; ];
deployment.tags = [ "eu" "apps" "wg" ]; deployment.tags = [ "eu" "apps" ];
system.stateVersion = "23.11"; system.stateVersion = "23.11";
}; };
# VPS4 exists. It's useful for garage replication but not much more.
vps4 = { lib, modulesPath, ... }: { vps4 = { lib, modulesPath, ... }: {
imports = [ imports = [
(modulesPath + "/profiles/qemu-guest.nix") (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, ... }: { vps5 = { name, nodes, modulesPath, config, pkgs, ... }: {
imports = [ imports = [
(modulesPath + "/profiles/qemu-guest.nix") (modulesPath + "/profiles/qemu-guest.nix")
@ -245,7 +249,7 @@
./modules/garage ./modules/garage
]; ];
deployment.tags = [ "eu" "apps" "wg" ]; deployment.tags = [ "eu" "apps" ];
system.stateVersion = "23.11"; system.stateVersion = "23.11";
}; };
} }

10
newinfra/nix/modules/backup/default.nix
View file

@ -3,7 +3,7 @@ let
jobOptions = { ... }: { jobOptions = { ... }: {
options = { options = {
app = mkOption { app = mkOption {
type = types.string; type = types.str;
description = "The app name, used as the directory in the bucket"; description = "The app name, used as the directory in the bucket";
}; };
environmentFile = mkOption { environmentFile = mkOption {
@ -11,20 +11,20 @@ let
default = null; default = null;
}; };
file = mkOption { file = mkOption {
type = types.nullOr types.string; type = types.nullOr types.str;
default = null; default = null;
}; };
pgDump = mkOption { pgDump = mkOption {
type = types.nullOr (types.submodule ({ ... }: { type = types.nullOr (types.submodule ({ ... }: {
options = { options = {
containerName = mkOption { containerName = mkOption {
type = types.string; type = types.str;
}; };
dbName = mkOption { dbName = mkOption {
type = types.string; type = types.str;
}; };
userName = mkOption { userName = mkOption {
type = types.string; type = types.str;
}; };
}; };
})); }));