chore: switch smb to domain/remove wireguard
This commit is contained in:
parent
063a6d9f24
commit
906a3ed803
|
@ -38,4 +38,5 @@
|
||||||
];
|
];
|
||||||
age.identityPaths = [ "/state/etc/ssh/ssh_host_ed25519_key" ];
|
age.identityPaths = [ "/state/etc/ssh/ssh_host_ed25519_key" ];
|
||||||
boot.mode = lib.mkDefault "efi";
|
boot.mode = lib.mkDefault "efi";
|
||||||
|
documentation.enable = lib.mkDefault false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,19 +39,6 @@ in
|
||||||
##];
|
##];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
wireguard.samba-patrick.server = {
|
|
||||||
host = config.secrets.secrets.global.domains.web;
|
|
||||||
port = 51830;
|
|
||||||
reservedAddresses = [
|
|
||||||
"10.43.0.0/20"
|
|
||||||
"fd00:1765::/112"
|
|
||||||
];
|
|
||||||
openFirewall = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
networking.nftables.firewall.zones.untrusted.interfaces = [
|
|
||||||
"samba-patrick"
|
|
||||||
];
|
|
||||||
|
|
||||||
services.samba = {
|
services.samba = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
networking.nftables.firewall.zones.untrusted.interfaces = [ "lan01" ];
|
networking.nftables.firewall.zones.untrusted.interfaces = [ "lan01" ];
|
||||||
wireguard.samba-patrick.client.via = "elisabeth-samba";
|
|
||||||
services.mullvad-vpn = {
|
services.mullvad-vpn = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.mullvad-vpn;
|
package = pkgs.mullvad-vpn;
|
||||||
|
@ -35,7 +34,7 @@
|
||||||
"/etc/mullvad-vpn"
|
"/etc/mullvad-vpn"
|
||||||
{
|
{
|
||||||
directory = "/var/lib/netbird-main";
|
directory = "/var/lib/netbird-main";
|
||||||
owner = "netbird-main";
|
user = "netbird-main";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
services.netbird = {
|
services.netbird = {
|
||||||
|
|
|
@ -27,5 +27,4 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
nixpkgs.hostPlatform = "x86_64-linux";
|
nixpkgs.hostPlatform = "x86_64-linux";
|
||||||
documentation.enable = false;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
devoloog-sae19.rekeyFile = ./secrets/iwd/devoloog-sae19.age;
|
devoloog-sae19.rekeyFile = ./secrets/iwd/devoloog-sae19.age;
|
||||||
devoloog-sae20.rekeyFile = ./secrets/iwd/devoloog-sae20.age;
|
devoloog-sae20.rekeyFile = ./secrets/iwd/devoloog-sae20.age;
|
||||||
};
|
};
|
||||||
wireguard.samba-patrick.client.via = "elisabeth-samba";
|
|
||||||
networking.nftables.firewall.zones.untrusted.interfaces = [
|
networking.nftables.firewall.zones.untrusted.interfaces = [
|
||||||
"lan01"
|
"lan01"
|
||||||
"lan02"
|
"lan02"
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
{ config, nodes, ... }:
|
{ config, ... }:
|
||||||
{
|
{
|
||||||
hm.home.smb =
|
hm.home.smb =
|
||||||
let
|
let
|
||||||
address = nodes.elisabeth-samba.config.wireguard.samba-patrick.ipv4;
|
address = "smb.${config.secrets.secrets.global.domains.web}";
|
||||||
credentials = config.age.secrets.smb-creds.path;
|
credentials = config.age.secrets.smb-creds.path;
|
||||||
in
|
in
|
||||||
[
|
[
|
||||||
|
|
Loading…
Reference in a new issue