parent
45a9b7475b
commit
aad4502030
|
@ -9,7 +9,7 @@ Flakes:
|
|||
|
||||
Other:
|
||||
|
||||
$ nix build .#nixosConfigurations.vno1-rp3b.config.system.build.toplevel
|
||||
$ nix build .#nixosConfigurations.vno3-rp3b.config.system.build.toplevel
|
||||
|
||||
Debug
|
||||
|
||||
|
|
4
data.nix
4
data.nix
|
@ -55,7 +55,7 @@ rec {
|
|||
publicIP = "88.223.107.21";
|
||||
jakstIP = "100.89.176.4";
|
||||
};
|
||||
"vno1-rp3b.servers.jakst" = rec {
|
||||
"vno3-rp3b.servers.jakst" = rec {
|
||||
extraHostNames = [jakstIP];
|
||||
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBudUFFEBpUVdr26vLJup8Hk6wj1iDbOPPQnJbv6GUGC";
|
||||
jakstIP = "100.89.176.2";
|
||||
|
@ -128,7 +128,7 @@ rec {
|
|||
dl A ${vno1}
|
||||
fra1-a A ${fra1a}
|
||||
vno1 A ${vno1}
|
||||
hdd A ${hosts."vno1-rp3b.servers.jakst".jakstIP}
|
||||
hdd A ${hosts."vno3-rp3b.servers.jakst".jakstIP}
|
||||
|
||||
@ MX 10 aspmx.l.google.com.
|
||||
@ MX 20 alt1.aspmx.l.google.com.
|
||||
|
|
12
flake.nix
12
flake.nix
|
@ -95,9 +95,9 @@
|
|||
specialArgs = {inherit myData;} // inputs;
|
||||
};
|
||||
|
||||
nixosConfigurations.vno1-rp3b = nixpkgs.lib.nixosSystem {
|
||||
nixosConfigurations.vno3-rp3b = nixpkgs.lib.nixosSystem {
|
||||
modules = [
|
||||
./hosts/vno1-rp3b/configuration.nix
|
||||
./hosts/vno3-rp3b/configuration.nix
|
||||
|
||||
./modules
|
||||
|
||||
|
@ -109,7 +109,7 @@
|
|||
age.secrets.root-passwd-hash.file = ./secrets/root_passwd_hash.age;
|
||||
age.secrets.sasl-passwd.file = ./secrets/postfix_sasl_passwd.age;
|
||||
|
||||
age.secrets.datapool-passphrase.file = ./secrets/vno1-rp3b/datapool-passphrase.age;
|
||||
age.secrets.datapool-passphrase.file = ./secrets/vno3-rp3b/datapool-passphrase.age;
|
||||
}
|
||||
];
|
||||
|
||||
|
@ -148,13 +148,13 @@
|
|||
};
|
||||
};
|
||||
|
||||
deploy.nodes.vno1-rp3b = {
|
||||
hostname = myData.hosts."vno1-rp3b.servers.jakst".jakstIP;
|
||||
deploy.nodes.vno3-rp3b = {
|
||||
hostname = myData.hosts."vno3-rp3b.servers.jakst".jakstIP;
|
||||
profiles = {
|
||||
system = {
|
||||
sshUser = "motiejus";
|
||||
path =
|
||||
deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.vno1-rp3b;
|
||||
deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.vno3-rp3b;
|
||||
user = "root";
|
||||
};
|
||||
};
|
||||
|
|
|
@ -77,7 +77,7 @@
|
|||
}
|
||||
{
|
||||
mountpoint = "/var/lib";
|
||||
repo = "borgstor@${myData.hosts."vno1-rp3b.servers.jakst".jakstIP}:${config.networking.hostName}.${config.networking.domain}-var_lib";
|
||||
repo = "borgstor@${myData.hosts."vno3-rp3b.servers.jakst".jakstIP}:${config.networking.hostName}.${config.networking.domain}-var_lib";
|
||||
paths = [
|
||||
"/var/lib/.snapshot-latest/bitwarden_rs"
|
||||
"/var/lib/.snapshot-latest/caddy"
|
||||
|
@ -105,7 +105,7 @@
|
|||
}
|
||||
{
|
||||
mountpoint = "/var/log";
|
||||
repo = "borgstor@${myData.hosts."vno1-rp3b.servers.jakst".jakstIP}:${config.networking.hostName}.${config.networking.domain}-var_log";
|
||||
repo = "borgstor@${myData.hosts."vno3-rp3b.servers.jakst".jakstIP}:${config.networking.hostName}.${config.networking.domain}-var_log";
|
||||
paths = ["/var/log/.snapshot-latest/caddy/"];
|
||||
patterns = [
|
||||
"+ /var/log/.snapshot-latest/caddy/access-jakstys.lt.log-*.zst"
|
||||
|
@ -126,7 +126,7 @@
|
|||
}
|
||||
{
|
||||
mountpoint = "/home";
|
||||
repo = "borgstor@${myData.hosts."vno1-rp3b.servers.jakst".jakstIP}:${config.networking.hostName}.${config.networking.domain}-home-motiejus-annex2";
|
||||
repo = "borgstor@${myData.hosts."vno3-rp3b.servers.jakst".jakstIP}:${config.networking.hostName}.${config.networking.domain}-home-motiejus-annex2";
|
||||
paths = [
|
||||
"/home/.snapshot-latest/motiejus/annex2"
|
||||
"/home/.snapshot-latest/motiejus/.config/syncthing"
|
||||
|
@ -185,7 +185,7 @@
|
|||
repo = "git@git.jakstys.lt:motiejus/config";
|
||||
deployDerivations = [
|
||||
".#vno1-oh2"
|
||||
".#vno1-rp3b"
|
||||
".#vno3-rp3b"
|
||||
".#fra1-a"
|
||||
];
|
||||
};
|
||||
|
@ -412,8 +412,8 @@
|
|||
static_configs = [{targets = ["${myData.hosts."fra1-a.servers.jakst".jakstIP}:${port}"];}];
|
||||
}
|
||||
{
|
||||
job_name = "vno1-rp3b.servers.jakst";
|
||||
static_configs = [{targets = ["${myData.hosts."vno1-rp3b.servers.jakst".jakstIP}:${port}"];}];
|
||||
job_name = "vno3-rp3b.servers.jakst";
|
||||
static_configs = [{targets = ["${myData.hosts."vno3-rp3b.servers.jakst".jakstIP}:${port}"];}];
|
||||
}
|
||||
{
|
||||
job_name = "snmp_exporter";
|
||||
|
|
|
@ -106,7 +106,7 @@
|
|||
|
||||
networking = {
|
||||
hostId = "4bd17751";
|
||||
hostName = "vno1-rp3b";
|
||||
hostName = "vno3-rp3b";
|
||||
domain = "servers.jakst";
|
||||
dhcpcd.enable = true;
|
||||
};
|
|
@ -7,8 +7,8 @@ let
|
|||
|
||||
fra1-a = (import ./data.nix).hosts."fra1-a.servers.jakst".publicKey;
|
||||
vno1-oh2 = (import ./data.nix).hosts."vno1-oh2.servers.jakst".publicKey;
|
||||
vno1-rp3b = (import ./data.nix).hosts."vno1-rp3b.servers.jakst".publicKey;
|
||||
systems = [fra1-a vno1-oh2 vno1-rp3b];
|
||||
vno3-rp3b = (import ./data.nix).hosts."vno3-rp3b.servers.jakst".publicKey;
|
||||
systems = [fra1-a vno1-oh2 vno3-rp3b];
|
||||
|
||||
mk = auth: keyNames:
|
||||
builtins.listToAttrs (
|
||||
|
@ -36,8 +36,8 @@ in
|
|||
// mk ([fra1-a] ++ motiejus) [
|
||||
"secrets/vno1-oh2/zfs-passphrase.age"
|
||||
]
|
||||
// mk ([vno1-rp3b] ++ motiejus) [
|
||||
"secrets/vno1-rp3b/datapool-passphrase.age"
|
||||
// mk ([vno3-rp3b] ++ motiejus) [
|
||||
"secrets/vno3-rp3b/datapool-passphrase.age"
|
||||
]
|
||||
// mk (systems ++ motiejus) [
|
||||
"secrets/motiejus_passwd_hash.age"
|
||||
|
|
Loading…
Reference in New Issue