rouven.seifert/nixos-config
1
1
Fork 0
mirror of https://git.sr.ht/~rouven/nixos-config synced 2025-01-18 17:11:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

dns: move all local hosts under vpn.rfive.de

Browse source
This commit is contained in:
Rouven Seifert 2024-04-01 14:23:43 +02:00
parent 0b0ddf7faf
commit 0205b8b2ea
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
3 changed files with 8 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hosts/falkenstein/modules/dns/default.nix
View file

@ -6,7 +6,7 @@ let
$ORIGIN rfive.de. $ORIGIN rfive.de.
rfive.de. 86400 IN SOA ns.rfive.de. hostmaster.rfive.de. ( rfive.de. 86400 IN SOA ns.rfive.de. hostmaster.rfive.de. (
2024032601 ; serial 2024040102 ; serial
10800 ; refresh 10800 ; refresh
3600 ; retry 3600 ; retry
604800 ; expire 604800 ; expire

4
hosts/thinkpad/modules/networks/default.nix
View file

@ -163,8 +163,8 @@
networkConfig = { networkConfig = {
Address = "192.168.43.3/32"; Address = "192.168.43.3/32";
DNS = "192.168.43.1"; DNS = "192.168.43.1";
Domains = "~lan"; Domains = "~vpn.rfive.de";
DNSSEC = true; DNSSEC = false;
BindCarrier = [ "wlp9s0" ]; BindCarrier = [ "wlp9s0" ];
}; };
}; };

31
users/rouven/modules/ssh/default.nix
View file

@ -3,14 +3,14 @@ let
git = "~/.ssh/git"; git = "~/.ssh/git";
in in
{ {
programs.ssh = rec { programs.ssh = {
enable = true; enable = true;
compression = true; compression = true;
controlMaster = "auto"; controlMaster = "auto";
controlPersist = "10m"; controlPersist = "10m";
extraConfig = '' extraConfig = ''
CanonicalizeHostname yes CanonicalizeHostname yes
CanonicalDomains agdsn.network CanonicalDomains agdsn.network vpn.rfive.de
PKCS11Provider /run/current-system/sw/lib/libtpm2_pkcs11.so PKCS11Provider /run/current-system/sw/lib/libtpm2_pkcs11.so
IdentityFile ~/.ssh/id_ed25519 IdentityFile ~/.ssh/id_ed25519
VisualHostKey = yes VisualHostKey = yes
@ -21,26 +21,6 @@ in
match = "Host github.com User git"; match = "Host github.com User git";
identityFile = git; identityFile = git;
}; };
"rfive.de" = {
hostname = "falkenstein.rfive.de";
user = "root";
extraOptions = {
VerifyHostKeyDNS = "yes";
};
};
# used for nix remote building
falkenstein = matchBlocks."rfive.de";
"nuc" = {
hostname = "192.168.42.2";
user = "root";
};
"router" = {
hostname = "192.168.42.1";
user = "root";
};
# iFSR # iFSR
"fsr" = { "fsr" = {
hostname = "ifsr.de"; hostname = "ifsr.de";
@ -70,10 +50,6 @@ in
hostname = "tomate.ifsr.de"; hostname = "tomate.ifsr.de";
user = "root"; user = "root";
}; };
"durian" = {
hostname = "durian.ifsr.de";
user = "root";
};
"git@ifsr.de" = { "git@ifsr.de" = {
match = "Host ifsr.de User git"; match = "Host ifsr.de User git";
identityFile = git; identityFile = git;
@ -94,6 +70,9 @@ in
VerifyHostKeyDNS = "yes"; VerifyHostKeyDNS = "yes";
}; };
}; };
"*.vpn.rfive.de" = {
user = "root";
};
"git@git.agdsn.de" = { "git@git.agdsn.de" = {
match = "Host git.agdsn.de User git"; match = "Host git.agdsn.de User git";
identityFile = git; identityFile = git;