commit 01302aa7128facdc234451de5f8b62b543b0a090 · pyrox.dev/nixpkgs

+17 -6

nixos/modules/services/networking/bird-lg.nix

···

       16
       16
        
           {

     

       17
       17
        
             "--servers" = lib.concatStringsSep "," fe.servers;

     

       18
       18
        
             "--domain" = fe.domain;

     

       19
       19
       -
             "--listen" = fe.listenAddress;

     

       19
       19
       +
             "--listen" = stringOrConcat "," fe.listenAddresses;

     

       20
       20
        
             "--proxy-port" = fe.proxyPort;

     

       21
       21
        
             "--whois" = fe.whois;

     

       22
       22
        
             "--dns-interface" = fe.dnsInterface;

     
···

       37
       37
        
           {

     

       38
       38
        
             "--allowed" = lib.concatStringsSep "," px.allowedIPs;

     

       39
       39
        
             "--bird" = px.birdSocket;

     

       40
       40
       -
             "--listen" = px.listenAddress;

     

       40
       40
       +
             "--listen" = stringOrConcat "," px.listenAddresses;

     

       41
       41
        
             "--traceroute_bin" = px.traceroute.binary;

     

       42
       42
        
             "--traceroute_flags" = lib.concatStringsSep " " px.traceroute.flags;

     

       43
       43
        
             "--traceroute_raw" = px.traceroute.rawOutput;

     
···

       58
       58
        
           args: lib.mapAttrsToList (name: value: "${name} " + mkArgValue value) (filterNull args);

     

       59
       59
        
       in

     

       60
       60
        
       {

     

       61
       61
       +
         imports = [

     

       62
       62
       +
           (lib.mkRenamedOptionModule

     

       63
       63
       +
             [ "services" "bird-lg" "frontend" "listenAddress" ]

     

       64
       64
       +
             [ "services" "bird-lg" "frontend" "listenAddresses" ]

     

       65
       65
       +
           )

     

       66
       66
       +
           (lib.mkRenamedOptionModule

     

       67
       67
       +
             [ "services" "bird-lg" "proxy" "listenAddress" ]

     

       68
       68
       +
             [ "services" "bird-lg" "proxy" "listenAddresses" ]

     

       69
       69
       +
           )

     

       70
       70
       +
         ];

     

       71
       71
       +
       

     

       61
       72
        
         options = {

     

       62
       73
        
           services.bird-lg = {

     

       63
       74
        
             package = lib.mkPackageOption pkgs "bird-lg" { };

     
···

       77
       88
        
             frontend = {

     

       78
       89
        
               enable = lib.mkEnableOption "Bird Looking Glass Frontend Webserver";

     

       79
       90
        
       

     

       80
       80
       -
               listenAddress = lib.mkOption {

     

       81
       81
       -
                 type = lib.types.str;

     

       91
       91
       +
               listenAddresses = lib.mkOption {

     

       92
       92
       +
                 type = with lib.types; either str (listOf str);

     

       82
       93
        
                 default = "127.0.0.1:5000";

     

       83
       94
        
                 description = "Address to listen on.";

     

       84
       95
        
               };

     
···

       202
       213
        
             proxy = {

     

       203
       214
        
               enable = lib.mkEnableOption "Bird Looking Glass Proxy";

     

       204
       215
        
       

     

       205
       205
       -
               listenAddress = lib.mkOption {

     

       206
       206
       -
                 type = lib.types.str;

     

       216
       216
       +
               listenAddresses = lib.mkOption {

     

       217
       217
       +
                 type = with lib.types; either str (listOf str);

     

       207
       218
        
                 default = "127.0.0.1:8000";

     

       208
       219
        
                 description = "Address to listen on.";

     

       209
       220
        
               };

+4 -4

pkgs/by-name/bi/bird-lg/package.nix

···

       9
       9
        
           { modRoot, vendorHash }:

     

       10
       10
        
           buildGoModule rec {

     

       11
       11
        
             pname = "bird-lg-${modRoot}";

     

       12
       12
       -
             version = "1.3.8";

     

       12
       12
       +
             version = "1.3.11";

     

       13
       13
        
       

     

       14
       14
        
             src = fetchFromGitHub {

     

       15
       15
        
               owner = "xddxdd";

     

       16
       16
        
               repo = "bird-lg-go";

     

       17
       17
        
               rev = "v${version}";

     

       18
       18
       -
               hash = "sha256-j81cfHqXNsTM93ofxXz+smkjN8OdJXxtm9z5LdzC+r8=";

     

       18
       18
       +
               hash = "sha256-C0JC8vLLEk+d6vlrtuW7tHj06K7A3HBjKXZ5Nt+2i4I=";

     

       19
       19
        
             };

     

       20
       20
        
       

     

       21
       21
        
             doDist = false;

     
···

       41
       41
        
       

     

       42
       42
        
         bird-lg-frontend = generic {

     

       43
       43
        
           modRoot = "frontend";

     

       44
       44
       -
           vendorHash = "sha256-luJuIZ0xN8mdtWwTlfEDnAwMgt+Tzxlk2ZIDPIwHpcY=";

     

       44
       44
       +
           vendorHash = "sha256-kNysGHtOUtYGHDFDlYNzdkCXGUll105Triy4UR7UP0M=";

     

       45
       45
        
         };

     

       46
       46
        
       

     

       47
       47
        
         bird-lg-proxy = generic {

     

       48
       48
        
           modRoot = "proxy";

     

       49
       49
       -
           vendorHash = "sha256-OVyfPmLTHV5RFdLgRHEH/GqxuG5MnGt9Koz0DxpSg+4=";

     

       49
       49
       +
           vendorHash = "sha256-iosWHHeJyqMPF+Y01+mj70HDKWw0FAZKDpEESAwS/i4=";

     

       50
       50
        
         };

     

       51
       51
        
       in

     

       52
       52
        
       symlinkJoin {