fwminex.{motiejus->servers}.jakst

This commit is contained in:
Motiejus Jakštys 2024-07-31 09:19:13 +03:00
parent cda7123260
commit 8e80b76c12
8 changed files with 13 additions and 13 deletions

View File

@ -87,7 +87,7 @@ rec {
"gccarch-armv8-a" "gccarch-armv8-a"
]; ];
}; };
"fwminex.motiejus.jakst" = rec { "fwminex.servers.jakst" = rec {
extraHostNames = [ extraHostNames = [
jakstIP jakstIP
vno1IP vno1IP
@ -135,7 +135,7 @@ rec {
mHosts = attrVals [ mHosts = attrVals [
"mxp10.motiejus.jakst" "mxp10.motiejus.jakst"
"mtworx.motiejus.jakst" "mtworx.motiejus.jakst"
"fwminex.motiejus.jakst" "fwminex.servers.jakst"
] hosts; ] hosts;
in in
builtins.catAttrs "jakstIP" mHosts; builtins.catAttrs "jakstIP" mHosts;

View File

@ -284,7 +284,7 @@
}; };
fwminex = { fwminex = {
hostname = myData.hosts."fwminex.motiejus.jakst".jakstIP; hostname = myData.hosts."fwminex.servers.jakst".jakstIP;
profiles = { profiles = {
system = { system = {
sshUser = "motiejus"; sshUser = "motiejus";

View File

@ -73,7 +73,7 @@ in
sshAllowSubnet = myData.subnets.tailscale.sshPattern; sshAllowSubnet = myData.subnets.tailscale.sshPattern;
publicKeys = map (h: myData.hosts.${h}.publicKey) [ publicKeys = map (h: myData.hosts.${h}.publicKey) [
"vno1-oh2.servers.jakst" "vno1-oh2.servers.jakst"
"fwminex.motiejus.jakst" "fwminex.servers.jakst"
"mtworx.motiejus.jakst" "mtworx.motiejus.jakst"
]; ];
}; };
@ -85,7 +85,7 @@ in
deployerbot = { deployerbot = {
follower = { follower = {
publicKeys = [ myData.hosts."fwminex.motiejus.jakst".publicKey ]; publicKeys = [ myData.hosts."fwminex.servers.jakst".publicKey ];
enable = true; enable = true;
sshAllowSubnets = [ myData.subnets.tailscale.sshPattern ]; sshAllowSubnets = [ myData.subnets.tailscale.sshPattern ];

View File

@ -167,7 +167,7 @@ in
}; };
follower = { follower = {
publicKeys = [ myData.hosts."fwminex.motiejus.jakst".publicKey ]; publicKeys = [ myData.hosts."fwminex.servers.jakst".publicKey ];
enable = true; enable = true;
uidgid = myData.uidgid.updaterbot-deployee; uidgid = myData.uidgid.updaterbot-deployee;

View File

@ -122,7 +122,7 @@ in
deployerbot = { deployerbot = {
follower = { follower = {
publicKeys = [ myData.hosts."fwminex.motiejus.jakst".publicKey ]; publicKeys = [ myData.hosts."fwminex.servers.jakst".publicKey ];
enable = true; enable = true;
uidgid = myData.uidgid.updaterbot-deployee; uidgid = myData.uidgid.updaterbot-deployee;

View File

@ -193,7 +193,7 @@
deployerbot = { deployerbot = {
follower = { follower = {
publicKeys = [ myData.hosts."fwminex.motiejus.jakst".publicKey ]; publicKeys = [ myData.hosts."fwminex.servers.jakst".publicKey ];
enable = true; enable = true;
sshAllowSubnets = [ myData.subnets.tailscale.sshPattern ]; sshAllowSubnets = [ myData.subnets.tailscale.sshPattern ];
@ -463,8 +463,8 @@
static_configs = [ { targets = [ "${myData.hosts."vno3-rp3b.servers.jakst".jakstIP}:${port}" ]; } ]; static_configs = [ { targets = [ "${myData.hosts."vno3-rp3b.servers.jakst".jakstIP}:${port}" ]; } ];
} }
{ {
job_name = "fwminex.motiejus.jakst"; job_name = "fwminex.servers.jakst";
static_configs = [ { targets = [ "${myData.hosts."fwminex.motiejus.jakst".jakstIP}:${port}" ]; } ]; static_configs = [ { targets = [ "${myData.hosts."fwminex.servers.jakst".jakstIP}:${port}" ]; } ];
} }
{ {
job_name = "mtworx.motiejus.jakst"; job_name = "mtworx.motiejus.jakst";

View File

@ -85,7 +85,7 @@
dataDir = "/data/borg"; dataDir = "/data/borg";
sshKeys = with myData; [ sshKeys = with myData; [
hosts."vno1-oh2.servers.jakst".publicKey hosts."vno1-oh2.servers.jakst".publicKey
hosts."fwminex.motiejus.jakst".publicKey hosts."fwminex.servers.jakst".publicKey
people_pubkeys.motiejus people_pubkeys.motiejus
]; ];
}; };
@ -97,7 +97,7 @@
deployerbot = { deployerbot = {
follower = { follower = {
publicKeys = [ myData.hosts."fwminex.motiejus.jakst".publicKey ]; publicKeys = [ myData.hosts."fwminex.servers.jakst".publicKey ];
enable = true; enable = true;
sshAllowSubnets = [ myData.subnets.tailscale.sshPattern ]; sshAllowSubnets = [ myData.subnets.tailscale.sshPattern ];

View File

@ -6,7 +6,7 @@ let
bk2 = "age14f39j0wx84n93lgqn6d9gcd3yhuwak6qwrxy8v83ydn7266uafts09ecva"; bk2 = "age14f39j0wx84n93lgqn6d9gcd3yhuwak6qwrxy8v83ydn7266uafts09ecva";
}; };
fwminex = (import ./data.nix).hosts."fwminex.motiejus.jakst".publicKey; fwminex = (import ./data.nix).hosts."fwminex.servers.jakst".publicKey;
mtworx = (import ./data.nix).hosts."mtworx.motiejus.jakst".publicKey; mtworx = (import ./data.nix).hosts."mtworx.motiejus.jakst".publicKey;
fra1-b = (import ./data.nix).hosts."fra1-b.servers.jakst".publicKey; fra1-b = (import ./data.nix).hosts."fra1-b.servers.jakst".publicKey;
vno1-oh2 = (import ./data.nix).hosts."vno1-oh2.servers.jakst".publicKey; vno1-oh2 = (import ./data.nix).hosts."vno1-oh2.servers.jakst".publicKey;