b12f/os
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

wireguard/ssh: add pub.solar wireguard config

Browse source
This commit is contained in:
Benjamin Yule Bädorf 2024-04-06 02:35:51 +02:00
parent 3d2b5f7c78
commit 9578d0fa1a
Signed by: b12f
GPG key ID: 729956E1124F8F26
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/wireguard/pub.solar.nix
View file

@ -25,8 +25,6 @@ in {
networking.firewall.allowedUDPPorts = [51821]; networking.firewall.allowedUDPPorts = [51821];
systemd.services.wireguard-wg-pub-solar = { systemd.services.wireguard-wg-pub-solar = {
enable = false;
after = [ after = [
"network.target" "network.target"
"network-online.target" "network-online.target"
@ -52,14 +50,18 @@ in {
privateKeyFile = cfg.privateKeyFile; privateKeyFile = cfg.privateKeyFile;
peers = [ peers = [
{ {
endpoint = "flora6.pub.solar:51820"; endpoint = "flora-6.pub.solar:51820";
publicKey = "jtSR5G2P/nm9s8WrVc26Xc/SQLupRxyXE+5eIeqlsTU="; publicKey = "jtSR5G2P/nm9s8WrVc26Xc/SQLupRxyXE+5eIeqlsTU=";
allowedIPs = [ "10.7.6.2/32" "fd00:fae:fae:fae:fae:2::/96" ]; allowedIPs = [ "10.7.6.2/32" "fd00:fae:fae:fae:fae:2::/96" ];
persistentKeepalive = 15;
dynamicEndpointRefreshSeconds = 30;
} }
{ {
endpoint = "nachtigall.pub.solar:51820"; endpoint = "nachtigall.pub.solar:51820";
publicKey = "qzNywKY9RvqTnDO8eLik75/SHveaSk9OObilDzv+xkk="; publicKey = "qzNywKY9RvqTnDO8eLik75/SHveaSk9OObilDzv+xkk=";
allowedIPs = [ "10.7.6.1/32" "fd00:fae:fae:fae:fae:1::/96" ]; allowedIPs = [ "10.7.6.1/32" "fd00:fae:fae:fae:fae:1::/96" ];
persistentKeepalive = 15;
dynamicEndpointRefreshSeconds = 30;
} }
]; ];
}; };

3
pkgs/default.nix
View file

@ -3,9 +3,10 @@ with prev; {
# keep sources this first # keep sources this first
sources = callPackage (import ./_sources/generated.nix) {}; sources = callPackage (import ./_sources/generated.nix) {};
# then, call packages with `final.callPackage` # then, call packages with `final.callPackage`
# caddy = callPackage (import ./caddy) {};
check-battery = writeShellScriptBin "check-battery" (import ./check-battery.nix final); check-battery = writeShellScriptBin "check-battery" (import ./check-battery.nix final);
concourse = import ./concourse.nix final; concourse = import ./concourse.nix final;
element-b12f = writeShellScriptBin "element-b12f" (import ./element-desktop.nix { inherit final; profile = "b12f"; });
element-mezza = writeShellScriptBin "element-mezza" (import ./element-desktop.nix { inherit final; profile = "mezza"; });
fetch-hostingde-invoices = import ./fetch-hostingde-invoices final; fetch-hostingde-invoices = import ./fetch-hostingde-invoices final;
import-gtk-settings = writeShellScriptBin "import-gtk-settings" (import ./import-gtk-settings.nix final); import-gtk-settings = writeShellScriptBin "import-gtk-settings" (import ./import-gtk-settings.nix final);
lgcl = writeShellScriptBin "lgcl" (import ./lgcl.nix final); lgcl = writeShellScriptBin "lgcl" (import ./lgcl.nix final);

2
users/b12f/ssh.nix
View file

@ -122,10 +122,12 @@ in {
"nachtigall.pub.solar" = { "nachtigall.pub.solar" = {
user = "barkeeper"; user = "barkeeper";
hostname = "10.7.6.1";
}; };
"flora-6.pub.solar" = { "flora-6.pub.solar" = {
user = "barkeeper"; user = "barkeeper";
hostname = "10.7.6.2";
}; };
}; };
}; };