diff --git a/nixos/modules/services/networking/bird-lg.nix b/nixos/modules/services/networking/bird-lg.nix index 5d7b7c30f04c..8b7977c2ae4d 100644 --- a/nixos/modules/services/networking/bird-lg.nix +++ b/nixos/modules/services/networking/bird-lg.nix @@ -16,7 +16,7 @@ let { "--servers" = lib.concatStringsSep "," fe.servers; "--domain" = fe.domain; - "--listen" = fe.listenAddress; + "--listen" = stringOrConcat "," fe.listenAddresses; "--proxy-port" = fe.proxyPort; "--whois" = fe.whois; "--dns-interface" = fe.dnsInterface; @@ -37,7 +37,7 @@ let { "--allowed" = lib.concatStringsSep "," px.allowedIPs; "--bird" = px.birdSocket; - "--listen" = px.listenAddress; + "--listen" = stringOrConcat "," px.listenAddresses; "--traceroute_bin" = px.traceroute.binary; "--traceroute_flags" = lib.concatStringsSep " " px.traceroute.flags; "--traceroute_raw" = px.traceroute.rawOutput; @@ -58,6 +58,17 @@ let args: lib.mapAttrsToList (name: value: "${name} " + mkArgValue value) (filterNull args); in { + imports = [ + (lib.mkRenamedOptionModule + [ "services" "bird-lg" "frontend" "listenAddress" ] + [ "services" "bird-lg" "frontend" "listenAddresses" ] + ) + (lib.mkRenamedOptionModule + [ "services" "bird-lg" "proxy" "listenAddress" ] + [ "services" "bird-lg" "proxy" "listenAddresses" ] + ) + ]; + options = { services.bird-lg = { package = lib.mkPackageOption pkgs "bird-lg" { }; @@ -77,8 +88,8 @@ in frontend = { enable = lib.mkEnableOption "Bird Looking Glass Frontend Webserver"; - listenAddress = lib.mkOption { - type = lib.types.str; + listenAddresses = lib.mkOption { + type = with lib.types; either str (listOf str); default = "127.0.0.1:5000"; description = "Address to listen on."; }; @@ -202,8 +213,8 @@ in proxy = { enable = lib.mkEnableOption "Bird Looking Glass Proxy"; - listenAddress = lib.mkOption { - type = lib.types.str; + listenAddresses = lib.mkOption { + type = with lib.types; either str (listOf str); default = "127.0.0.1:8000"; description = "Address to listen on."; }; diff --git a/pkgs/by-name/bi/bird-lg/package.nix b/pkgs/by-name/bi/bird-lg/package.nix index 9a751950ed02..3e65067056d9 100644 --- a/pkgs/by-name/bi/bird-lg/package.nix +++ b/pkgs/by-name/bi/bird-lg/package.nix @@ -9,13 +9,13 @@ let { modRoot, vendorHash }: buildGoModule rec { pname = "bird-lg-${modRoot}"; - version = "1.3.8"; + version = "1.3.11"; src = fetchFromGitHub { owner = "xddxdd"; repo = "bird-lg-go"; rev = "v${version}"; - hash = "sha256-j81cfHqXNsTM93ofxXz+smkjN8OdJXxtm9z5LdzC+r8="; + hash = "sha256-C0JC8vLLEk+d6vlrtuW7tHj06K7A3HBjKXZ5Nt+2i4I="; }; doDist = false; @@ -41,12 +41,12 @@ let bird-lg-frontend = generic { modRoot = "frontend"; - vendorHash = "sha256-luJuIZ0xN8mdtWwTlfEDnAwMgt+Tzxlk2ZIDPIwHpcY="; + vendorHash = "sha256-kNysGHtOUtYGHDFDlYNzdkCXGUll105Triy4UR7UP0M="; }; bird-lg-proxy = generic { modRoot = "proxy"; - vendorHash = "sha256-OVyfPmLTHV5RFdLgRHEH/GqxuG5MnGt9Koz0DxpSg+4="; + vendorHash = "sha256-iosWHHeJyqMPF+Y01+mj70HDKWw0FAZKDpEESAwS/i4="; }; in symlinkJoin {