jakst.vpn
This commit is contained in:
parent
5b0d71dc2a
commit
6310a6e74e
@ -26,4 +26,4 @@ Decode a secret on host (to test things out):
|
|||||||
Borg
|
Borg
|
||||||
----
|
----
|
||||||
|
|
||||||
BORG_PASSCOMMAND="cat /run/agenix/borgbackup-fwminex" borg --remote-path=borg1 list zh2769@zh2769.rsync.net:fwminex.servers.jakst-home-motiejus-annex2
|
BORG_PASSCOMMAND="cat /run/agenix/borgbackup-fwminex" borg --remote-path=borg1 list zh2769@zh2769.rsync.net:fwminex.jakst.vpn-home-motiejus-annex2
|
||||||
|
46
data.nix
46
data.nix
@ -49,7 +49,7 @@ rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
hosts = {
|
hosts = {
|
||||||
"vno4-rutx11.servers.jakst" = rec {
|
"vno4-rutx11.jakst.vpn" = rec {
|
||||||
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMEehmFvEBVngwxk1nuEWMlE4UU69gC4wxytGX5DAFbh";
|
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMEehmFvEBVngwxk1nuEWMlE4UU69gC4wxytGX5DAFbh";
|
||||||
publicIP = "188.69.241.222";
|
publicIP = "188.69.241.222";
|
||||||
jakstIP = "100.89.176.1";
|
jakstIP = "100.89.176.1";
|
||||||
@ -61,7 +61,7 @@ rec {
|
|||||||
vno4IP
|
vno4IP
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
"vno3-nk.servers.jakst" = rec {
|
"vno3-nk.jakst.vpn" = rec {
|
||||||
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBp3QL8p4AbuijEQX/uVHj6nkJ2/8qNSciL+Glydw2yK";
|
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBp3QL8p4AbuijEQX/uVHj6nkJ2/8qNSciL+Glydw2yK";
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
jakstIP = "100.89.176.5";
|
jakstIP = "100.89.176.5";
|
||||||
@ -69,7 +69,7 @@ rec {
|
|||||||
jakstIP
|
jakstIP
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
"fra1-b.servers.jakst" = rec {
|
"fra1-b.jakst.vpn" = rec {
|
||||||
extraHostNames = [
|
extraHostNames = [
|
||||||
"fra1-b.jakstys.lt"
|
"fra1-b.jakstys.lt"
|
||||||
publicIP
|
publicIP
|
||||||
@ -87,7 +87,7 @@ rec {
|
|||||||
"gccarch-armv8-a"
|
"gccarch-armv8-a"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
"vno1-gdrx.motiejus.jakst" = rec {
|
"vno1-gdrx.jakst.vpn" = rec {
|
||||||
extraHostNames = [
|
extraHostNames = [
|
||||||
vno1IP
|
vno1IP
|
||||||
jakstIP
|
jakstIP
|
||||||
@ -96,7 +96,7 @@ rec {
|
|||||||
vno1IP = "192.168.189.12";
|
vno1IP = "192.168.189.12";
|
||||||
jakstIP = "100.89.176.21";
|
jakstIP = "100.89.176.21";
|
||||||
};
|
};
|
||||||
"fwminex.servers.jakst" = rec {
|
"fwminex.jakst.vpn" = rec {
|
||||||
extraHostNames = [
|
extraHostNames = [
|
||||||
"jakstys.lt"
|
"jakstys.lt"
|
||||||
"git.jakstys.lt"
|
"git.jakstys.lt"
|
||||||
@ -113,17 +113,17 @@ rec {
|
|||||||
jakstIP = "100.89.176.6";
|
jakstIP = "100.89.176.6";
|
||||||
vno1IP = "192.168.189.10";
|
vno1IP = "192.168.189.10";
|
||||||
};
|
};
|
||||||
"mtworx.motiejus.jakst" = rec {
|
"mtworx.jakst.vpn" = rec {
|
||||||
extraHostNames = [ jakstIP ];
|
extraHostNames = [ jakstIP ];
|
||||||
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK/2oa3/NDV7GQNAKEQdJ+LZMwK0TUr1wChJMkZM1I3b";
|
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK/2oa3/NDV7GQNAKEQdJ+LZMwK0TUr1wChJMkZM1I3b";
|
||||||
jakstIP = "100.89.176.3";
|
jakstIP = "100.89.176.3";
|
||||||
};
|
};
|
||||||
"vno1-vinc.vincentas.jakst" = rec {
|
"vno1-vinc.jakst.vpn" = rec {
|
||||||
extraHostNames = [ jakstIP ];
|
extraHostNames = [ jakstIP ];
|
||||||
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJIwK7et5NBM+vaffiwpKLSAJwKfwMhCZwl1JyXo79uL";
|
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJIwK7et5NBM+vaffiwpKLSAJwKfwMhCZwl1JyXo79uL";
|
||||||
jakstIP = "100.89.176.7";
|
jakstIP = "100.89.176.7";
|
||||||
};
|
};
|
||||||
"mxp1.motiejus.jakst" = {
|
"mxp1.jakst.vpn" = {
|
||||||
jakstIP = "100.89.176.22";
|
jakstIP = "100.89.176.22";
|
||||||
};
|
};
|
||||||
"zh2769.rsync.net" = {
|
"zh2769.rsync.net" = {
|
||||||
@ -149,10 +149,10 @@ rec {
|
|||||||
motiejus.cidrs =
|
motiejus.cidrs =
|
||||||
let
|
let
|
||||||
mHosts = attrVals [
|
mHosts = attrVals [
|
||||||
"mxp1.motiejus.jakst"
|
"mxp1.jakst.vpn"
|
||||||
"vno1-gdrx.motiejus.jakst"
|
"vno1-gdrx.jakst.vpn"
|
||||||
"mtworx.motiejus.jakst"
|
"mtworx.jakst.vpn"
|
||||||
"fwminex.servers.jakst"
|
"fwminex.jakst.vpn"
|
||||||
] hosts;
|
] hosts;
|
||||||
in
|
in
|
||||||
builtins.catAttrs "jakstIP" mHosts;
|
builtins.catAttrs "jakstIP" mHosts;
|
||||||
@ -166,9 +166,9 @@ rec {
|
|||||||
|
|
||||||
jakstysLTZone =
|
jakstysLTZone =
|
||||||
let
|
let
|
||||||
fra1b = hosts."fra1-b.servers.jakst".publicIP;
|
fra1b = hosts."fra1-b.jakst.vpn".publicIP;
|
||||||
vno1 = hosts."fwminex.servers.jakst".publicIP;
|
vno1 = hosts."fwminex.jakst.vpn".publicIP;
|
||||||
vno4 = hosts."vno4-rutx11.servers.jakst".publicIP;
|
vno4 = hosts."vno4-rutx11.jakst.vpn".publicIP;
|
||||||
in
|
in
|
||||||
''
|
''
|
||||||
$ORIGIN jakstys.lt.
|
$ORIGIN jakstys.lt.
|
||||||
@ -179,7 +179,7 @@ rec {
|
|||||||
@ HTTPS 1 . alpn="h3,h2" ipv4hint="${vno1}"
|
@ HTTPS 1 . alpn="h3,h2" ipv4hint="${vno1}"
|
||||||
@ A ${vno1}
|
@ A ${vno1}
|
||||||
www A ${vno1}
|
www A ${vno1}
|
||||||
photos A ${hosts."fwminex.servers.jakst".jakstIP}
|
photos A ${hosts."fwminex.jakst.vpn".jakstIP}
|
||||||
ns1 86400 A ${vno1}
|
ns1 86400 A ${vno1}
|
||||||
ns2 86400 A ${fra1b}
|
ns2 86400 A ${fra1b}
|
||||||
vpn A ${vno1}
|
vpn A ${vno1}
|
||||||
@ -201,35 +201,35 @@ rec {
|
|||||||
_dmarc TXT "v=DMARC1; p=none;"
|
_dmarc TXT "v=DMARC1; p=none;"
|
||||||
google._domainkey TXT "v=DKIM1; k=rsa;" "p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqOyONnWKk7lgAVB1UcVu/I02gTDjROpQGDNUJHS34faQ9DnM/8uSOaIwCe4oV1GrI8N2ET+f96WPCCs1LzlEA0QwuUoXRLGojjQoXxCntLfMCnRWtehzmZq6Yv8nVva7N0gz/n/LThpPvGfEoKzYjmhjzM5d8y60DGsKxS8r4Lc9TzwtzuYkxKDhcSzVBQQiMvKMi6m6mUsxFya7" "ZTurd5i7iiZXpA3SFBYLAsjhQd6vS7K13vwAZTKjGNijfM40i7KXC5XA5WtojiSY0lZzAMqaHGLDaMUFkWRJJntRheQ+AU9RvOGAufphRAjdQTCMy0BLzC0rilT2JaTGe4MdQIDAQAB"
|
google._domainkey TXT "v=DKIM1; k=rsa;" "p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqOyONnWKk7lgAVB1UcVu/I02gTDjROpQGDNUJHS34faQ9DnM/8uSOaIwCe4oV1GrI8N2ET+f96WPCCs1LzlEA0QwuUoXRLGojjQoXxCntLfMCnRWtehzmZq6Yv8nVva7N0gz/n/LThpPvGfEoKzYjmhjzM5d8y60DGsKxS8r4Lc9TzwtzuYkxKDhcSzVBQQiMvKMi6m6mUsxFya7" "ZTurd5i7iiZXpA3SFBYLAsjhQd6vS7K13vwAZTKjGNijfM40i7KXC5XA5WtojiSY0lZzAMqaHGLDaMUFkWRJJntRheQ+AU9RvOGAufphRAjdQTCMy0BLzC0rilT2JaTGe4MdQIDAQAB"
|
||||||
|
|
||||||
grafana A ${hosts."fwminex.servers.jakst".jakstIP}
|
grafana A ${hosts."fwminex.jakst.vpn".jakstIP}
|
||||||
_acme-challenge.grafana CNAME _acme-endpoint.grafana
|
_acme-challenge.grafana CNAME _acme-endpoint.grafana
|
||||||
_acme-endpoint.grafana NS ns._acme-endpoint.grafana
|
_acme-endpoint.grafana NS ns._acme-endpoint.grafana
|
||||||
ns._acme-endpoint.grafana A ${vno1}
|
ns._acme-endpoint.grafana A ${vno1}
|
||||||
|
|
||||||
hass A ${hosts."fwminex.servers.jakst".jakstIP}
|
hass A ${hosts."fwminex.jakst.vpn".jakstIP}
|
||||||
_acme-challenge.hass CNAME _acme-endpoint.hass
|
_acme-challenge.hass CNAME _acme-endpoint.hass
|
||||||
_acme-endpoint.hass NS ns._acme-endpoint.hass
|
_acme-endpoint.hass NS ns._acme-endpoint.hass
|
||||||
ns._acme-endpoint.hass A ${vno1}
|
ns._acme-endpoint.hass A ${vno1}
|
||||||
|
|
||||||
irc A ${hosts."fwminex.servers.jakst".jakstIP}
|
irc A ${hosts."fwminex.jakst.vpn".jakstIP}
|
||||||
_acme-challenge.irc CNAME _acme-endpoint.irc
|
_acme-challenge.irc CNAME _acme-endpoint.irc
|
||||||
_acme-endpoint.irc NS ns._acme-endpoint.irc
|
_acme-endpoint.irc NS ns._acme-endpoint.irc
|
||||||
ns._acme-endpoint.irc A ${vno1}
|
ns._acme-endpoint.irc A ${vno1}
|
||||||
|
|
||||||
hass A ${hosts."fwminex.servers.jakst".jakstIP}
|
hass A ${hosts."fwminex.jakst.vpn".jakstIP}
|
||||||
_acme-challenge.hass CNAME _acme-endpoint.hass
|
_acme-challenge.hass CNAME _acme-endpoint.hass
|
||||||
_acme-endpoint.hass NS ns._acme-endpoint.hass
|
_acme-endpoint.hass NS ns._acme-endpoint.hass
|
||||||
ns._acme-endpoint.hass A ${vno1}
|
ns._acme-endpoint.hass A ${vno1}
|
||||||
|
|
||||||
bitwarden HTTPS 1 . alpn="h3,h2" ipv4hint="${
|
bitwarden HTTPS 1 . alpn="h3,h2" ipv4hint="${
|
||||||
hosts."fwminex.servers.jakst".jakstIP
|
hosts."fwminex.jakst.vpn".jakstIP
|
||||||
}"
|
}"
|
||||||
bitwarden A ${hosts."fwminex.servers.jakst".jakstIP}
|
bitwarden A ${hosts."fwminex.jakst.vpn".jakstIP}
|
||||||
_acme-challenge.bitwarden CNAME _acme-endpoint.bitwarden
|
_acme-challenge.bitwarden CNAME _acme-endpoint.bitwarden
|
||||||
_acme-endpoint.bitwarden NS ns._acme-endpoint.bitwarden
|
_acme-endpoint.bitwarden NS ns._acme-endpoint.bitwarden
|
||||||
ns._acme-endpoint.bitwarden A ${vno1}
|
ns._acme-endpoint.bitwarden A ${vno1}
|
||||||
|
|
||||||
hdd A ${hosts."vno3-nk.servers.jakst".jakstIP}
|
hdd A ${hosts."vno3-nk.jakst.vpn".jakstIP}
|
||||||
_acme-challenge.hdd CNAME _acme-endpoint.hdd
|
_acme-challenge.hdd CNAME _acme-endpoint.hdd
|
||||||
_acme-endpoint.hdd NS ns._acme-endpoint.hdd
|
_acme-endpoint.hdd NS ns._acme-endpoint.hdd
|
||||||
ns._acme-endpoint.hdd A ${vno1}
|
ns._acme-endpoint.hdd A ${vno1}
|
||||||
|
10
flake.nix
10
flake.nix
@ -216,7 +216,7 @@
|
|||||||
|
|
||||||
deploy.nodes = {
|
deploy.nodes = {
|
||||||
fwminex = {
|
fwminex = {
|
||||||
hostname = myData.hosts."fwminex.servers.jakst".jakstIP;
|
hostname = myData.hosts."fwminex.jakst.vpn".jakstIP;
|
||||||
profiles = {
|
profiles = {
|
||||||
system = {
|
system = {
|
||||||
sshUser = "motiejus";
|
sshUser = "motiejus";
|
||||||
@ -227,7 +227,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
mtworx = {
|
mtworx = {
|
||||||
hostname = myData.hosts."mtworx.motiejus.jakst".jakstIP;
|
hostname = myData.hosts."mtworx.jakst.vpn".jakstIP;
|
||||||
profiles = {
|
profiles = {
|
||||||
system = {
|
system = {
|
||||||
sshUser = "motiejus";
|
sshUser = "motiejus";
|
||||||
@ -238,7 +238,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
vno1-gdrx = {
|
vno1-gdrx = {
|
||||||
hostname = myData.hosts."vno1-gdrx.motiejus.jakst".jakstIP;
|
hostname = myData.hosts."vno1-gdrx.jakst.vpn".jakstIP;
|
||||||
profiles = {
|
profiles = {
|
||||||
system = {
|
system = {
|
||||||
sshUser = "motiejus";
|
sshUser = "motiejus";
|
||||||
@ -249,7 +249,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
vno3-nk = {
|
vno3-nk = {
|
||||||
hostname = myData.hosts."vno3-nk.servers.jakst".jakstIP;
|
hostname = myData.hosts."vno3-nk.jakst.vpn".jakstIP;
|
||||||
profiles = {
|
profiles = {
|
||||||
system = {
|
system = {
|
||||||
sshUser = "motiejus";
|
sshUser = "motiejus";
|
||||||
@ -260,7 +260,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
fra1-b = {
|
fra1-b = {
|
||||||
hostname = myData.hosts."fra1-b.servers.jakst".jakstIP;
|
hostname = myData.hosts."fra1-b.jakst.vpn".jakstIP;
|
||||||
profiles = {
|
profiles = {
|
||||||
system = {
|
system = {
|
||||||
sshUser = "motiejus";
|
sshUser = "motiejus";
|
||||||
|
@ -90,9 +90,9 @@ in
|
|||||||
uidgid = myData.uidgid.remote-builder;
|
uidgid = myData.uidgid.remote-builder;
|
||||||
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-gdrx.motiejus.jakst"
|
"vno1-gdrx.jakst.vpn"
|
||||||
"fwminex.servers.jakst"
|
"fwminex.jakst.vpn"
|
||||||
"mtworx.motiejus.jakst"
|
"mtworx.jakst.vpn"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -103,7 +103,7 @@ in
|
|||||||
|
|
||||||
deployerbot = {
|
deployerbot = {
|
||||||
follower = {
|
follower = {
|
||||||
publicKeys = [ myData.hosts."fwminex.servers.jakst".publicKey ];
|
publicKeys = [ myData.hosts."fwminex.jakst.vpn".publicKey ];
|
||||||
|
|
||||||
enable = true;
|
enable = true;
|
||||||
sshAllowSubnets = [ myData.subnets.tailscale.sshPattern ];
|
sshAllowSubnets = [ myData.subnets.tailscale.sshPattern ];
|
||||||
@ -131,7 +131,7 @@ in
|
|||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "fra1-b";
|
hostName = "fra1-b";
|
||||||
domain = "servers.jakst";
|
domain = "jakst.vpn";
|
||||||
useDHCP = true;
|
useDHCP = true;
|
||||||
interfaces.enp1s0.ipv6.addresses = [
|
interfaces.enp1s0.ipv6.addresses = [
|
||||||
{
|
{
|
||||||
|
@ -405,10 +405,10 @@ in
|
|||||||
let
|
let
|
||||||
port = toString config.services.prometheus.exporters.ping.port;
|
port = toString config.services.prometheus.exporters.ping.port;
|
||||||
hosts = [
|
hosts = [
|
||||||
"fwminex.servers.jakst"
|
"fwminex.jakst.vpn"
|
||||||
"vno3-nk.servers.jakst"
|
"vno3-nk.jakst.vpn"
|
||||||
"fra1-b.servers.jakst"
|
"fra1-b.jakst.vpn"
|
||||||
"vno1-gdrx.motiejus.jakst"
|
"vno1-gdrx.jakst.vpn"
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
|
|
||||||
@ -443,8 +443,8 @@ in
|
|||||||
static_configs = [ { targets = [ "127.0.0.1:${toString myData.ports.exporters.weather}" ]; } ];
|
static_configs = [ { targets = [ "127.0.0.1:${toString myData.ports.exporters.weather}" ]; } ];
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
job_name = "vno1-vinc.vincentas.jakst";
|
job_name = "vno1-vinc.jakst.vpn";
|
||||||
static_configs = [ { targets = [ "${myData.hosts."vno1-vinc.vincentas.jakst".jakstIP}:9100" ]; } ];
|
static_configs = [ { targets = [ "${myData.hosts."vno1-vinc.jakst.vpn".jakstIP}:9100" ]; } ];
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
++ map
|
++ map
|
||||||
@ -458,11 +458,11 @@ in
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
[
|
[
|
||||||
"fra1-b.servers.jakst"
|
"fra1-b.jakst.vpn"
|
||||||
"vno3-nk.servers.jakst"
|
"vno3-nk.jakst.vpn"
|
||||||
"fwminex.servers.jakst"
|
"fwminex.jakst.vpn"
|
||||||
"mtworx.motiejus.jakst"
|
"mtworx.jakst.vpn"
|
||||||
"vno1-gdrx.motiejus.jakst"
|
"vno1-gdrx.jakst.vpn"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -520,7 +520,7 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
dataDir = "/var/lib/borgstor";
|
dataDir = "/var/lib/borgstor";
|
||||||
sshKeys = with myData; [
|
sshKeys = with myData; [
|
||||||
hosts."vno3-nk.servers.jakst".publicKey
|
hosts."vno3-nk.jakst.vpn".publicKey
|
||||||
people_pubkeys.motiejus
|
people_pubkeys.motiejus
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
@ -611,7 +611,7 @@ in
|
|||||||
)
|
)
|
||||||
[
|
[
|
||||||
"zh2769@zh2769.rsync.net"
|
"zh2769@zh2769.rsync.net"
|
||||||
"borgstor@${myData.hosts."vno3-nk.servers.jakst".jakstIP}"
|
"borgstor@${myData.hosts."vno3-nk.jakst.vpn".jakstIP}"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -655,7 +655,7 @@ in
|
|||||||
|
|
||||||
remote-builder.client =
|
remote-builder.client =
|
||||||
let
|
let
|
||||||
host = myData.hosts."fra1-b.servers.jakst";
|
host = myData.hosts."fra1-b.jakst.vpn";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
enable = true;
|
enable = true;
|
||||||
@ -677,17 +677,17 @@ in
|
|||||||
deployIfPresent = [
|
deployIfPresent = [
|
||||||
{
|
{
|
||||||
derivationTarget = ".#mtworx";
|
derivationTarget = ".#mtworx";
|
||||||
pingTarget = myData.hosts."mtworx.motiejus.jakst".jakstIP;
|
pingTarget = myData.hosts."mtworx.jakst.vpn".jakstIP;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
derivationTarget = ".#vno1-gdrx";
|
derivationTarget = ".#vno1-gdrx";
|
||||||
pingTarget = myData.hosts."vno1-gdrx.motiejus.jakst".jakstIP;
|
pingTarget = myData.hosts."vno1-gdrx.jakst.vpn".jakstIP;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
follower = {
|
follower = {
|
||||||
publicKeys = [ myData.hosts."fwminex.servers.jakst".publicKey ];
|
publicKeys = [ myData.hosts."fwminex.jakst.vpn".publicKey ];
|
||||||
|
|
||||||
enable = true;
|
enable = true;
|
||||||
uidgid = myData.uidgid.updaterbot-deployee;
|
uidgid = myData.uidgid.updaterbot-deployee;
|
||||||
@ -739,7 +739,7 @@ in
|
|||||||
networking = {
|
networking = {
|
||||||
hostId = "a6b19da0";
|
hostId = "a6b19da0";
|
||||||
hostName = "fwminex";
|
hostName = "fwminex";
|
||||||
domain = "servers.jakst";
|
domain = "jakst.vpn";
|
||||||
firewall = {
|
firewall = {
|
||||||
rejectPackets = true;
|
rejectPackets = true;
|
||||||
allowedUDPPorts = [
|
allowedUDPPorts = [
|
||||||
|
@ -133,7 +133,7 @@ in
|
|||||||
|
|
||||||
remote-builder.client =
|
remote-builder.client =
|
||||||
let
|
let
|
||||||
host = myData.hosts."fra1-b.servers.jakst";
|
host = myData.hosts."fra1-b.jakst.vpn";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
enable = true;
|
enable = true;
|
||||||
@ -150,7 +150,7 @@ in
|
|||||||
|
|
||||||
deployerbot = {
|
deployerbot = {
|
||||||
follower = {
|
follower = {
|
||||||
publicKeys = [ myData.hosts."fwminex.servers.jakst".publicKey ];
|
publicKeys = [ myData.hosts."fwminex.jakst.vpn".publicKey ];
|
||||||
|
|
||||||
enable = true;
|
enable = true;
|
||||||
uidgid = myData.uidgid.updaterbot-deployee;
|
uidgid = myData.uidgid.updaterbot-deployee;
|
||||||
@ -199,7 +199,7 @@ in
|
|||||||
networking = {
|
networking = {
|
||||||
hostId = "b14a02aa";
|
hostId = "b14a02aa";
|
||||||
hostName = "mtworx";
|
hostName = "mtworx";
|
||||||
domain = "motiejus.jakst";
|
domain = "jakst.vpn";
|
||||||
firewall.rejectPackets = true;
|
firewall.rejectPackets = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -140,7 +140,7 @@ in
|
|||||||
|
|
||||||
remote-builder.client =
|
remote-builder.client =
|
||||||
let
|
let
|
||||||
host = myData.hosts."fra1-b.servers.jakst";
|
host = myData.hosts."fra1-b.jakst.vpn";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
enable = true;
|
enable = true;
|
||||||
@ -152,7 +152,7 @@ in
|
|||||||
|
|
||||||
deployerbot = {
|
deployerbot = {
|
||||||
follower = {
|
follower = {
|
||||||
publicKeys = [ myData.hosts."fwminex.servers.jakst".publicKey ];
|
publicKeys = [ myData.hosts."fwminex.jakst.vpn".publicKey ];
|
||||||
|
|
||||||
enable = true;
|
enable = true;
|
||||||
uidgid = myData.uidgid.updaterbot-deployee;
|
uidgid = myData.uidgid.updaterbot-deployee;
|
||||||
@ -181,7 +181,7 @@ in
|
|||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "vno1-gdrx";
|
hostName = "vno1-gdrx";
|
||||||
domain = "motiejus.jakst";
|
domain = "jakst.vpn";
|
||||||
firewall.rejectPackets = true;
|
firewall.rejectPackets = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -108,7 +108,7 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
dataDir = "/data/borg";
|
dataDir = "/data/borg";
|
||||||
sshKeys = with myData; [
|
sshKeys = with myData; [
|
||||||
hosts."fwminex.servers.jakst".publicKey
|
hosts."fwminex.jakst.vpn".publicKey
|
||||||
people_pubkeys.motiejus
|
people_pubkeys.motiejus
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
@ -140,7 +140,7 @@ in
|
|||||||
)
|
)
|
||||||
[
|
[
|
||||||
"zh2769@zh2769.rsync.net"
|
"zh2769@zh2769.rsync.net"
|
||||||
"borgstor@${myData.hosts."fwminex.servers.jakst".jakstIP}"
|
"borgstor@${myData.hosts."fwminex.jakst.vpn".jakstIP}"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -164,7 +164,7 @@ in
|
|||||||
|
|
||||||
remote-builder.client =
|
remote-builder.client =
|
||||||
let
|
let
|
||||||
host = myData.hosts."fra1-b.servers.jakst";
|
host = myData.hosts."fra1-b.jakst.vpn";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
enable = true;
|
enable = true;
|
||||||
@ -193,7 +193,7 @@ in
|
|||||||
deployerbot = {
|
deployerbot = {
|
||||||
follower = {
|
follower = {
|
||||||
enable = true;
|
enable = true;
|
||||||
publicKeys = [ myData.hosts."fwminex.servers.jakst".publicKey ];
|
publicKeys = [ myData.hosts."fwminex.jakst.vpn".publicKey ];
|
||||||
sshAllowSubnets = [ myData.subnets.tailscale.sshPattern ];
|
sshAllowSubnets = [ myData.subnets.tailscale.sshPattern ];
|
||||||
uidgid = myData.uidgid.updaterbot-deployee;
|
uidgid = myData.uidgid.updaterbot-deployee;
|
||||||
};
|
};
|
||||||
@ -212,7 +212,7 @@ in
|
|||||||
networking = {
|
networking = {
|
||||||
hostId = "ab4af0bb";
|
hostId = "ab4af0bb";
|
||||||
hostName = "vno3-nk";
|
hostName = "vno3-nk";
|
||||||
domain = "servers.jakst";
|
domain = "jakst.vpn";
|
||||||
firewall = {
|
firewall = {
|
||||||
rejectPackets = true;
|
rejectPackets = true;
|
||||||
allowedUDPPorts = [
|
allowedUDPPorts = [
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
extraConfig =
|
extraConfig =
|
||||||
''
|
''
|
||||||
Host git.jakstys.lt
|
Host git.jakstys.lt
|
||||||
HostName ${myData.hosts."fwminex.servers.jakst".jakstIP}
|
HostName ${myData.hosts."fwminex.jakst.vpn".jakstIP}
|
||||||
|
|
||||||
''
|
''
|
||||||
+ (lib.concatMapStringsSep "\n"
|
+ (lib.concatMapStringsSep "\n"
|
||||||
@ -37,7 +37,7 @@
|
|||||||
'')
|
'')
|
||||||
(
|
(
|
||||||
builtins.attrNames (
|
builtins.attrNames (
|
||||||
lib.filterAttrs (name: props: name != "fra1-b.servers.jakst" && props ? jakstIP) myData.hosts
|
lib.filterAttrs (name: props: name != "fra1-b.jakst.vpn" && props ? jakstIP) myData.hosts
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
10
secrets.nix
10
secrets.nix
@ -6,11 +6,11 @@ let
|
|||||||
bk2 = "age14f39j0wx84n93lgqn6d9gcd3yhuwak6qwrxy8v83ydn7266uafts09ecva";
|
bk2 = "age14f39j0wx84n93lgqn6d9gcd3yhuwak6qwrxy8v83ydn7266uafts09ecva";
|
||||||
};
|
};
|
||||||
|
|
||||||
fwminex = (import ./data.nix).hosts."fwminex.servers.jakst".publicKey;
|
fwminex = (import ./data.nix).hosts."fwminex.jakst.vpn".publicKey;
|
||||||
vno3-nk = (import ./data.nix).hosts."vno3-nk.servers.jakst".publicKey;
|
vno3-nk = (import ./data.nix).hosts."vno3-nk.jakst.vpn".publicKey;
|
||||||
fra1-b = (import ./data.nix).hosts."fra1-b.servers.jakst".publicKey;
|
fra1-b = (import ./data.nix).hosts."fra1-b.jakst.vpn".publicKey;
|
||||||
mtworx = (import ./data.nix).hosts."mtworx.motiejus.jakst".publicKey;
|
mtworx = (import ./data.nix).hosts."mtworx.jakst.vpn".publicKey;
|
||||||
vno1-gdrx = (import ./data.nix).hosts."vno1-gdrx.motiejus.jakst".publicKey;
|
vno1-gdrx = (import ./data.nix).hosts."vno1-gdrx.jakst.vpn".publicKey;
|
||||||
|
|
||||||
systems = [
|
systems = [
|
||||||
fwminex
|
fwminex
|
||||||
|
Loading…
Reference in New Issue
Block a user