qenya/nixfiles
1
0
Fork 0
Code Issues 5 Pull requests Actions Activity

birdsong: rename option peer -> peering

Browse source
This commit is contained in:
Katherina Walshe-Grey 2024-07-25 08:14:41 +01:00
parent 70247124a6
commit d17ef00e1c
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hosts/orm/configuration.nix
View file

@ -11,7 +11,7 @@
age.secrets.wireguard-peer-orm.file = ../../secrets/wireguard-peer-orm.age; age.secrets.wireguard-peer-orm.file = ../../secrets/wireguard-peer-orm.age;
birdsong.peer = { birdsong.peering = {
enable = true; enable = true;
privateKeyFile = config.age.secrets.wireguard-peer-orm.path; privateKeyFile = config.age.secrets.wireguard-peer-orm.path;
}; };

2
hosts/tohru/configuration.nix
View file

@ -16,7 +16,7 @@
age.secrets.wireguard-peer-tohru.file = ../../secrets/wireguard-peer-tohru.age; age.secrets.wireguard-peer-tohru.file = ../../secrets/wireguard-peer-tohru.age;
birdsong.peer = { birdsong.peering = {
enable = true; enable = true;
privateKeyFile = config.age.secrets.wireguard-peer-tohru.path; privateKeyFile = config.age.secrets.wireguard-peer-tohru.path;
persistentKeepalive = 23; persistentKeepalive = 23;

2
hosts/yevaud/configuration.nix
View file

@ -11,7 +11,7 @@
age.secrets.wireguard-peer-yevaud.file = ../../secrets/wireguard-peer-yevaud.age; age.secrets.wireguard-peer-yevaud.file = ../../secrets/wireguard-peer-yevaud.age;
birdsong.peer = { birdsong.peering = {
enable = true; enable = true;
privateKeyFile = config.age.secrets.wireguard-peer-yevaud.path; privateKeyFile = config.age.secrets.wireguard-peer-yevaud.path;
}; };

2
services/birdsong/default.nix
View file

@ -1,6 +1,6 @@
{ {
imports = [ imports = [
./peer.nix
./hosts.nix ./hosts.nix
./peering.nix
]; ];
} }

8
services/birdsong/peer.nix → services/birdsong/peering.nix
View file

@ -2,13 +2,13 @@
with lib; with lib;
let let
cfg = config.birdsong.peer; cfg = config.birdsong.peering;
hostName = if null != cfg.hostName then cfg.hostName else config.networking.hostName; hostName = if null != cfg.hostName then cfg.hostName else config.networking.hostName;
hosts = config.birdsong.hosts; hosts = config.birdsong.hosts;
host = hosts.${hostName}; host = hosts.${hostName};
in in
{ {
options.birdsong.peer = { options.birdsong.peering = {
enable = mkEnableOption "WireGuard peering with the birdsong network"; enable = mkEnableOption "WireGuard peering with the birdsong network";
hostName = mkOption { hostName = mkOption {
default = null; default = null;
@ -53,11 +53,11 @@ in
assertions = [ assertions = [
{ {
assertion = cfg ? privateKeyFile; assertion = cfg ? privateKeyFile;
message = "birdsong.peer.privateKeyFile must be set"; message = "birdsong.peering.privateKeyFile must be set";
} }
{ {
assertion = hostName != null; assertion = hostName != null;
message = "birdsong.peer.hostName or networking.hostName must be set"; message = "birdsong.peering.hostName or networking.hostName must be set";
} }
]; ];