c3d2/dn42.nix
c3d2/dn42.nix
22
0
Fork 0
Code Issues Pull Requests Releases Activity

move rtr options into networking.dn42

Browse Source
This commit is contained in:
Marcel - 2024-04-14 12:19:46 +02:00
parent 025898329e
commit ab45974a4a
Signed by: m4rc3l
GPG Key ID: 446F3B093DF81C6A
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/bird2.nix
View File

@ -38,7 +38,7 @@ in
roa4 table dnroa4; roa4 table dnroa4;
roa6 table dnroa6; roa6 table dnroa6;
${lib.optionalString config.services.dn42-stayrtr.enable '' ${lib.optionalString config.networking.dn42.stayrtr.enable ''
protocol rpki roa_dn42 { protocol rpki roa_dn42 {
roa4 { table dnroa4; }; roa4 { table dnroa4; };
roa6 { table dnroa6; }; roa6 { table dnroa6; };
@ -49,14 +49,14 @@ in
expire 7200; expire 7200;
} }
''} ''}
${lib.optionalString config.services.dn42-roagen.enable '' ${lib.optionalString config.networking.dn42.roagen.enable ''
protocol static { protocol static {
roa4 { table dnroa4; }; roa4 { table dnroa4; };
include "${config.services.dn42-roagen.outputDir}/dn42-roa4.conf"; include "${config.networking.dn42.roagen.outputDir}/dn42-roa4.conf";
} }
protocol static { protocol static {
roa6 { table dnroa6; }; roa6 { table dnroa6; };
include "${config.services.dn42-roagen.outputDir}/dn42-roa6.conf"; include "${config.networking.dn42.roagen.outputDir}/dn42-roa6.conf";
} }
''} ''}

5
modules/roagen.nix
View File

@ -1,11 +1,10 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.services.dn42-roagen; cfg = config.networking.dn42.roagen;
in in
{ {
options.services.dn42-roagen = with lib; { options.networking.dn42.roagen = with lib; {
enable = mkEnableOption "dn42-roagen"; enable = mkEnableOption "dn42-roagen";
outputDir = mkOption { outputDir = mkOption {

7
modules/stayrtr.nix
View File

@ -1,15 +1,14 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.services.dn42-stayrtr; cfg = config.networking.dn42.stayrtr;
in in
{ {
options.services.dn42-stayrtr = with lib; { options.networking.dn42.stayrtr = with lib; {
enable = mkEnableOption "dn42-stayrtr"; enable = mkEnableOption "dn42-stayrtr";
cache = mkOption { cache = mkOption {
type = types.url; type = types.str;
default = "https://dn42.burble.com/roa/dn42_roa_46.json"; default = "https://dn42.burble.com/roa/dn42_roa_46.json";
}; };
}; };