From 2c12cd8c74bba40b5e51e68120effdcdb57d79ee Mon Sep 17 00:00:00 2001 From: Patrick Date: Sat, 16 Nov 2024 11:21:01 +0100 Subject: [PATCH] fix: netbird new options --- config/services/netbird.nix | 7 +++++++ .../secrets/netbird/generated/relaySecret.age | Bin 0 -> 740 bytes patches/PR/354032.diff | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 hosts/elisabeth/secrets/netbird/generated/relaySecret.age diff --git a/config/services/netbird.nix b/config/services/netbird.nix index 144d884..6a7aba6 100644 --- a/config/services/netbird.nix +++ b/config/services/netbird.nix @@ -20,6 +20,11 @@ owner = "turnserver"; }; + age.secrets.relaySecret = { + generator.script = "alnum"; + owner = "turnserver"; + }; + age.secrets.dataEnc = { generator.script = { pkgs, ... }: @@ -42,6 +47,8 @@ }; }; + relay.authSecretFile = config.age.secrets.relaySecret.path; + coturn = { enable = true; passwordFile = config.age.secrets.coturnPassword.path; diff --git a/hosts/elisabeth/secrets/netbird/generated/relaySecret.age b/hosts/elisabeth/secrets/netbird/generated/relaySecret.age new file mode 100644 index 0000000000000000000000000000000000000000..0d2b795435c9ef5af27c25664ef62fb8ffeef51f GIT binary patch literal 740 zcmY+@C64DZFMkC(d$wukB@0J|Nu zvrRHrq%1LrE6eIHopF8IT@P$N_UaqWqx2R&P-VI$D zh^u(DDqS_Ks0?mp-*?pczG+0~tpBfeU79Am-+)YS1m$Tja2lnC=MhiEWlUK*<@6*% z_mf^VLFTy>wSz2+Vv)z&2c6M&#xHT!0pw_SpoI}&NNUdNJ#n6$vp~5VD&UFPhmy$0Su^Xog${8InlfA0H%4Aah{!uhWdlD;0U51HVrtcyR02k|@r_dB zR*7Tt<}BNlGxeYKun(M5qQ2_Y5}!4hG*&1@~4>kLJ#<$*-$7Tnhoi`OeF z3@il0FqEK+L|tyzzANAY?e~RLT&6=(St}gZ%)3BQWLV7%*;EYV?x(BYvD!_z_vqIf zY3B?*jN>*rriU%m=1{iwY^sXadVXr9%MerA7;cOHCx_T>1(m5aZx WU%2(+n!>3^lSAqqc6yYz?)(K39Q+#q literal 0 HcmV?d00001 diff --git a/patches/PR/354032.diff b/patches/PR/354032.diff index fdebc37..e0c7cf5 100644 --- a/patches/PR/354032.diff +++ b/patches/PR/354032.diff @@ -334,7 +334,7 @@ index 0000000000000..998ddbad212cf +} diff --git a/nixos/modules/services/networking/netbird/relay.nix b/nixos/modules/services/networking/netbird/relay.nix new file mode 100644 -index 0000000000000..45650d15358a0 +index 0000000000000..38af7fb1b2865 --- /dev/null +++ b/nixos/modules/services/networking/netbird/relay.nix @@ -0,0 +1,124 @@ @@ -403,7 +403,7 @@ index 0000000000000..45650d15358a0 + An attribute set that will be set as the environment for the process. + Used for runtime configuration. + The exact values sadly aren't documented anywhere. -+ A starting point when searching for valid values is this [source file](https://github.com/netbirdio/netbird/blob/v${cfg.packag.version}/relay/cmd/root.go) ++ A starting point when searching for valid values is this [source file](https://github.com/netbirdio/netbird/blob/main/relay/cmd/root.go) + ''; + }; +