commit 227697bc67b8228c454752d70a0b67071176b1e6 · pyrox.dev/nixpkgs

+2 -1

nixos/modules/rename.nix

···

       17
       17
        
           (mkRenamedOptionModule [ "services" "elasticsearch" "host" ] [ "services" "elasticsearch" "listenAddress" ])

     

       18
       18
        
           (mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ])

     

       19
       19
        
           (mkRenamedOptionModule [ "services" "graphite" "web" "host" ] [ "services" "graphite" "web" "listenAddress" ])

     

       20
       20
       +
           (mkRenamedOptionModule [ "services" "i2pd" "extIp" ] [ "services" "i2pd" "address" ])

     

       21
       21
       +
           (mkRenamedOptionModule [ "services" "kibana" "host" ] [ "services" "kibana" "listenAddress" ])

     

       20
       22
        
           (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ])

     

       21
       21
       -
           (mkRenamedOptionModule [ "services" "kibana" "host" ] [ "services" "kibana" "listenAddress" ])

     

       22
       23
        
           (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])

     

       23
       24
        
           (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ])

     

       24
       25
        
           (mkRenamedOptionModule [ "services" "shout" "host" ] [ "services" "shout" "listenAddress" ])

+104 -84

nixos/modules/services/networking/i2pd.nix

···

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         mkKeyedEndpointOpt = name: addr: port: keyFile:

     

       31
       31
       -
         (mkEndpointOpt name addr port) // {

     

       32
       32
       -
           keys = mkOption {

     

       33
       33
       -
             type = types.str;

     

       34
       34
       -
             default = "";

     

       35
       35
       -
             description = ''

     

       36
       36
       -
               File to persist ${lib.toUpper name} keys.

     

       37
       37
       -
             '';

     

       31
       31
       +
           (mkEndpointOpt name addr port) // {

     

       32
       32
       +
             keys = mkOption {

     

       33
       33
       +
               type = types.str;

     

       34
       34
       +
               default = "";

     

       35
       35
       +
               description = ''

     

       36
       36
       +
                 File to persist ${lib.toUpper name} keys.

     

       37
       37
       +
               '';

     

       38
       38
       +
             };

     

       38
       39
        
           };

     

       39
       39
       -
         };

     

       40
       40
        
       

     

       41
       41
        
         commonTunOpts = let

     

       42
       42
        
           i2cpOpts = {

     
···

       59
       59
        
             description = "Number of ElGamal/AES tags to send.";

     

       60
       60
        
             default = 40;

     

       61
       61
        
           };

     

       62
       62
       -
          destination = mkOption {

     

       62
       62
       +
           destination = mkOption {

     

       63
       63
        
             type = types.str;

     

       64
       64
        
             description = "Remote endpoint, I2P hostname or b32.i2p address.";

     

       65
       65
        
           };

     
···

       70
       70
        
           };

     

       71
       71
        
         } // mkEndpointOpt name "127.0.0.1" 0;

     

       72
       72
        
       

     

       73
       73
       -
         i2pdConf = pkgs.writeText "i2pd.conf"

     

       74
       74
       -
         ''

     

       75
       75
       -
         ipv4 = ${boolToString cfg.enableIPv4}

     

       76
       76
       -
         ipv6 = ${boolToString cfg.enableIPv6}

     

       77
       77
       -
         notransit = ${boolToString cfg.notransit}

     

       78
       78
       -
         floodfill = ${boolToString cfg.floodfill}

     

       79
       79
       -
         netid = ${toString cfg.netid}

     

       80
       80
       -
         ${if isNull cfg.bandwidth then "" else "bandwidth = ${toString cfg.bandwidth}" }

     

       81
       81
       -
         ${if isNull cfg.port then "" else "port = ${toString cfg.port}"}

     

       73
       73
       +
         i2pdConf = pkgs.writeText "i2pd.conf" ''

     

       74
       74
       +
           # DO NOT EDIT -- this file has been generated automatically.

     

       75
       75
       +
           loglevel = ${cfg.logLevel}

     

       82
       76
        
       

     

       83
       83
       -
         [limits]

     

       84
       84
       -
         transittunnels = ${toString cfg.limits.transittunnels}

     

       77
       77
       +
           ipv4 = ${boolToString cfg.enableIPv4}

     

       78
       78
       +
           ipv6 = ${boolToString cfg.enableIPv6}

     

       79
       79
       +
           notransit = ${boolToString cfg.notransit}

     

       80
       80
       +
           floodfill = ${boolToString cfg.floodfill}

     

       81
       81
       +
           netid = ${toString cfg.netid}

     

       82
       82
       +
           ${if isNull cfg.bandwidth then "" else "bandwidth = ${toString cfg.bandwidth}" }

     

       83
       83
       +
           ${if isNull cfg.port then "" else "port = ${toString cfg.port}"}

     

       85
       84
        
       

     

       86
       86
       -
         [upnp]

     

       87
       87
       -
         enabled = ${boolToString cfg.upnp.enable}

     

       88
       88
       -
         name = ${cfg.upnp.name}

     

       85
       85
       +
           [limits]

     

       86
       86
       +
           transittunnels = ${toString cfg.limits.transittunnels}

     

       89
       87
        
       

     

       90
       90
       -
         [precomputation]

     

       91
       91
       -
         elgamal = ${boolToString cfg.precomputation.elgamal}

     

       88
       88
       +
           [upnp]

     

       89
       89
       +
           enabled = ${boolToString cfg.upnp.enable}

     

       90
       90
       +
           name = ${cfg.upnp.name}

     

       92
       91
        
       

     

       93
       93
       -
         [reseed]

     

       94
       94
       -
         verify = ${boolToString cfg.reseed.verify}

     

       95
       95
       -
         file = ${cfg.reseed.file}

     

       96
       96
       -
         urls = ${builtins.concatStringsSep "," cfg.reseed.urls}

     

       92
       92
       +
           [precomputation]

     

       93
       93
       +
           elgamal = ${boolToString cfg.precomputation.elgamal}

     

       97
       94
        
       

     

       98
       98
       -
         [addressbook]

     

       99
       99
       -
         defaulturl = ${cfg.addressbook.defaulturl}

     

       100
       100
       -
         subscriptions = ${builtins.concatStringsSep "," cfg.addressbook.subscriptions}

     

       101
       101
       -
         ${flip concatMapStrings

     

       95
       95
       +
           [reseed]

     

       96
       96
       +
           verify = ${boolToString cfg.reseed.verify}

     

       97
       97
       +
           file = ${cfg.reseed.file}

     

       98
       98
       +
           urls = ${builtins.concatStringsSep "," cfg.reseed.urls}

     

       99
       99
       +
       

     

       100
       100
       +
           [addressbook]

     

       101
       101
       +
           defaulturl = ${cfg.addressbook.defaulturl}

     

       102
       102
       +
           subscriptions = ${builtins.concatStringsSep "," cfg.addressbook.subscriptions}

     

       103
       103
       +
       

     

       104
       104
       +
           ${flip concatMapStrings

     

       102
       105
        
             (collect (proto: proto ? port && proto ? address && proto ? name) cfg.proto)

     

       103
       103
       -
             (proto: let portStr = toString proto.port; in

     

       104
       104
       -
               ''

     

       105
       105
       -
                 [${proto.name}]

     

       106
       106
       -
                 enabled = ${boolToString proto.enable}

     

       107
       107
       -
                 address = ${proto.address}

     

       108
       108
       -
                 port = ${toString proto.port}

     

       109
       109
       -
                 ${if proto ? keys then "keys = ${proto.keys}" else ""}

     

       110
       110
       -
                 ${if proto ? auth then "auth = ${boolToString proto.auth}" else ""}

     

       111
       111
       -
                 ${if proto ? user then "user = ${proto.user}" else ""}

     

       112
       112
       -
                 ${if proto ? pass then "pass = ${proto.pass}" else ""}

     

       113
       113
       -
                 ${if proto ? outproxy then "outproxy = ${proto.outproxy}" else ""}

     

       114
       114
       -
                 ${if proto ? outproxyPort then "outproxyport = ${toString proto.outproxyPort}" else ""}

     

       115
       115
       -
               '')

     

       116
       116
       -
             }

     

       106
       106
       +
             (proto: let portStr = toString proto.port; in ''

     

       107
       107
       +
               [${proto.name}]

     

       108
       108
       +
               enabled = ${boolToString proto.enable}

     

       109
       109
       +
               address = ${proto.address}

     

       110
       110
       +
               port = ${toString proto.port}

     

       111
       111
       +
               ${if proto ? keys then "keys = ${proto.keys}" else ""}

     

       112
       112
       +
               ${if proto ? auth then "auth = ${boolToString proto.auth}" else ""}

     

       113
       113
       +
               ${if proto ? user then "user = ${proto.user}" else ""}

     

       114
       114
       +
               ${if proto ? pass then "pass = ${proto.pass}" else ""}

     

       115
       115
       +
               ${if proto ? outproxy then "outproxy = ${proto.outproxy}" else ""}

     

       116
       116
       +
               ${if proto ? outproxyPort then "outproxyport = ${toString proto.outproxyPort}" else ""}

     

       117
       117
       +
             '')

     

       118
       118
       +
           }

     

       117
       119
        
         '';

     

       118
       120
        
       

     

       119
       121
        
         i2pdTunnelConf = pkgs.writeText "i2pd-tunnels.conf" ''

     

       120
       120
       -
         ${flip concatMapStrings

     

       121
       121
       -
           (collect (tun: tun ? port && tun ? destination) cfg.outTunnels)

     

       122
       122
       -
           (tun: let portStr = toString tun.port; in ''

     

       123
       123
       -
         [${tun.name}]

     

       124
       124
       -
         type = client

     

       125
       125
       -
         destination = ${tun.destination}

     

       126
       126
       -
         keys = ${tun.keys}

     

       127
       127
       -
         address = ${tun.address}

     

       128
       128
       -
         port = ${toString tun.port}

     

       129
       129
       -
         inbound.length = ${toString tun.inbound.length}

     

       130
       130
       -
         outbound.length = ${toString tun.outbound.length}

     

       131
       131
       -
         inbound.quantity = ${toString tun.inbound.quantity}

     

       132
       132
       -
         outbound.quantity = ${toString tun.outbound.quantity}

     

       133
       133
       -
         crypto.tagsToSend = ${toString tun.crypto.tagsToSend}

     

       134
       134
       -
         '')

     

       135
       135
       -
         }

     

       136
       136
       -
         ${flip concatMapStrings

     

       137
       137
       -
           (collect (tun: tun ? port && tun ? host) cfg.inTunnels)

     

       138
       138
       -
           (tun: let portStr = toString tun.port; in ''

     

       139
       139
       -
         [${tun.name}]

     

       140
       140
       -
         type = server

     

       141
       141
       -
         destination = ${tun.destination}

     

       142
       142
       -
         keys = ${tun.keys}

     

       143
       143
       -
         host = ${tun.address}

     

       144
       144
       -
         port = ${tun.port}

     

       145
       145
       -
         inport = ${tun.inPort}

     

       146
       146
       -
         accesslist = ${builtins.concatStringsSep "," tun.accessList}

     

       147
       147
       -
         '')

     

       148
       148
       -
         }

     

       122
       122
       +
           # DO NOT EDIT -- this file has been generated automatically.

     

       123
       123
       +
           ${flip concatMapStrings

     

       124
       124
       +
             (collect (tun: tun ? port && tun ? destination) cfg.outTunnels)

     

       125
       125
       +
             (tun: let portStr = toString tun.port; in ''

     

       126
       126
       +
               [${tun.name}]

     

       127
       127
       +
               type = client

     

       128
       128
       +
               destination = ${tun.destination}

     

       129
       129
       +
               keys = ${tun.keys}

     

       130
       130
       +
               address = ${tun.address}

     

       131
       131
       +
               port = ${toString tun.port}

     

       132
       132
       +
               inbound.length = ${toString tun.inbound.length}

     

       133
       133
       +
               outbound.length = ${toString tun.outbound.length}

     

       134
       134
       +
               inbound.quantity = ${toString tun.inbound.quantity}

     

       135
       135
       +
               outbound.quantity = ${toString tun.outbound.quantity}

     

       136
       136
       +
               crypto.tagsToSend = ${toString tun.crypto.tagsToSend}

     

       137
       137
       +
             '')

     

       138
       138
       +
           }

     

       139
       139
       +
           ${flip concatMapStrings

     

       140
       140
       +
             (collect (tun: tun ? port && tun ? host) cfg.inTunnels)

     

       141
       141
       +
             (tun: let portStr = toString tun.port; in ''

     

       142
       142
       +
               [${tun.name}]

     

       143
       143
       +
               type = server

     

       144
       144
       +
               destination = ${tun.destination}

     

       145
       145
       +
               keys = ${tun.keys}

     

       146
       146
       +
               host = ${tun.address}

     

       147
       147
       +
               port = ${tun.port}

     

       148
       148
       +
               inport = ${tun.inPort}

     

       149
       149
       +
               accesslist = ${builtins.concatStringsSep "," tun.accessList}

     

       150
       150
       +
             '')

     

       151
       151
       +
           }

     

       149
       152
        
         '';

     

       150
       153
        
       

     

       151
       154
        
         i2pdSh = pkgs.writeScriptBin "i2pd" ''

     

       152
       155
        
           #!/bin/sh

     

       153
       153
       -
           ${pkgs.i2pd}/bin/i2pd \

     

       154
       154
       -
             ${if isNull cfg.extIp then "" else "--host="+cfg.extIp} \

     

       156
       156
       +
           exec ${pkgs.i2pd}/bin/i2pd \

     

       157
       157
       +
             ${if isNull cfg.address then "" else "--host="+cfg.address} \

     

       155
       158
        
             --conf=${i2pdConf} \

     

       156
       159
        
             --tunconf=${i2pdTunnelConf}

     

       157
       160
        
         '';

     
···

       176
       179
        
               '';

     

       177
       180
        
             };

     

       178
       181
        
       

     

       179
       179
       -
             extIp = mkOption {

     

       182
       182
       +
             logLevel = mkOption {

     

       183
       183
       +
               type = types.enum ["debug" "info" "warn" "error"];

     

       184
       184
       +
               default = "error";

     

       185
       185
       +
               description = ''

     

       186
       186
       +
                 The log level. <command>i2pd</command> defaults to "info"

     

       187
       187
       +
                 but that generates copious amounts of log messages.

     

       188
       188
       +
       

     

       189
       189
       +
                 We default to "error" which is similar to the default log

     

       190
       190
       +
                 level of <command>tor</command>.

     

       191
       191
       +
               '';

     

       192
       192
       +
             };

     

       193
       193
       +
       

     

       194
       194
       +
             address = mkOption {

     

       180
       195
        
               type = with types; nullOr str;

     

       181
       196
        
               default = null;

     

       182
       197
        
               description = ''

     

       183
       183
       -
                 Your external IP.

     

       198
       198
       +
                 Your external IP or hostname.

     

       184
       199
        
               '';

     

       185
       200
        
             };

     

       186
       201
        
       

     
···

       213
       228
        
               default = null;

     

       214
       229
        
               description = ''

     

       215
       230
        
                  Set a router bandwidth limit integer in KBps.

     

       216
       216
       -
                  If not set, i2pd defaults to 32KBps.

     

       231
       231
       +
                  If not set, <command>i2pd</command> defaults to 32KBps.

     

       217
       232
        
               '';

     

       218
       233
        
             };

     

       219
       234
        
       

     
···

       261
       276
        
       

     

       262
       277
        
             precomputation.elgamal = mkOption {

     

       263
       278
        
               type = types.bool;

     

       264
       264
       -
               default = false;

     

       279
       279
       +
               default = true;

     

       265
       280
        
               description = ''

     

       266
       266
       -
                 Use ElGamal precomputated tables.

     

       281
       281
       +
                 Whenever to use precomputated tables for ElGamal.

     

       282
       282
       +
                 <command>i2pd</command> defaults to <literal>false</literal>

     

       283
       283
       +
                 to save 64M of memory (and looses some performance).

     

       284
       284
       +
       

     

       285
       285
       +
                 We default to <literal>true</literal> as that is what most

     

       286
       286
       +
                 users want anyway.

     

       267
       287
        
               '';

     

       268
       288
        
             };

     

       269
       289
        
       

     
···

       353
       373
        
               };

     

       354
       374
        
             };

     

       355
       375
        
       

     

       356
       356
       -
             proto.httpProxy = mkKeyedEndpointOpt "httpproxy" "127.0.0.1" 4446 "";

     

       376
       376
       +
             proto.httpProxy = mkKeyedEndpointOpt "httpproxy" "127.0.0.1" 4444 "";

     

       357
       377
        
             proto.socksProxy = (mkKeyedEndpointOpt "socksproxy" "127.0.0.1" 4447 "")

     

       358
       378
        
             // {

     

       359
       379
        
               outproxy = mkOption {

+1 -1

pkgs/tools/networking/i2pd/default.nix

···

       23
       23
        
         meta = with stdenv.lib; {

     

       24
       24
        
           homepage = https://i2pd.website;

     

       25
       25
        
           description = "Minimal I2P router written in C++";

     

       26
       26
       -
           license = licenses.gpl2;

     

       26
       26
       +
           license = licenses.bsd3;

     

       27
       27
        
           maintainers = with maintainers; [ edwtjo ];

     

       28
       28
        
           platforms = platforms.linux;

     

       29
       29
        
         };