commit f316c67316d19be6b96329e94c9441613e3daefd · pyrox.dev/nixpkgs

+1 -1

nixos/doc/manual/release-notes/rl-2311.section.md

···

       1030
       1030
        
       

     

       1031
       1031
        
       - [eris-server](https://codeberg.org/eris/eris-go), an implementation of the

     

       1032
       1032
        
         Encoding for Robust Immutable Storage (ERIS). Available as

     

       1033
       1033
       -
         [services.eris-server](#opt-services.eris-server.enable).

     

       1033
       1033
       +
         `services.eris-server`.

     

       1034
       1034
        
       

     

       1035
       1035
        
       - [forgejo](https://forgejo.org/), a git forge and drop-in replacement for

     

       1036
       1036
        
         Gitea. Available as [services.forgejo](#opt-services.forgejo.enable).

nixos/doc/manual/release-notes/rl-2511.section.md

···

       184
       184
        
       

     

       185
       185
        
       - `services.clamsmtp` is unmaintained and was removed from Nixpkgs.

     

       186
       186
        
       

     

       187
       187
       +
       - `services.eris-server` was removed from Nixpkgs due to a hostile upstream.

     

       188
       188
       +
       

     

       187
       189
        
       - `prosody` gained a config check option named `services.prosody.checkConfig` which runs `prosodyctl check config` and is turned on by default.

     

       188
       190
        
       

     

       189
       191
        
       - `services.dependency-track` removed its configuration of the JVM heap size. This lets the JVM choose its maximum heap size automatically, which should work much better in practice for most users. For deployments on systems with little RAM, it may now be necessary to manually configure a maximum heap size using  {option}`services.dependency-track.javaArgs`.

-1

nixos/modules/module-list.nix

···

       1048
       1048
        
         ./services/network-filesystems/davfs2.nix

     

       1049
       1049
        
         ./services/network-filesystems/diod.nix

     

       1050
       1050
        
         ./services/network-filesystems/drbd.nix

     

       1051
       1051
       -
         ./services/network-filesystems/eris-server.nix

     

       1052
       1051
        
         ./services/network-filesystems/glusterfs.nix

     

       1053
       1052
        
         ./services/network-filesystems/ipfs-cluster.nix

     

       1054
       1053
        
         ./services/network-filesystems/kbfs.nix

-126

nixos/modules/services/network-filesystems/eris-server.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         config,

     

       3
       3
       -
         lib,

     

       4
       4
       -
         pkgs,

     

       5
       5
       -
         ...

     

       6
       6
       -
       }:

     

       7
       7
       -
       

     

       8
       8
       -
       let

     

       9
       9
       -
         cfg = config.services.eris-server;

     

       10
       10
       -
         stateDirectoryPath = "\${STATE_DIRECTORY}";

     

       11
       11
       -
         nullOrStr = with lib.types; nullOr str;

     

       12
       12
       -
       in

     

       13
       13
       -
       {

     

       14
       14
       -
       

     

       15
       15
       -
         options.services.eris-server = {

     

       16
       16
       -
       

     

       17
       17
       -
           enable = lib.mkEnableOption "an ERIS server";

     

       18
       18
       -
       

     

       19
       19
       -
           package = lib.mkOption {

     

       20
       20
       -
             type = lib.types.package;

     

       21
       21
       -
             default = pkgs.eris-go;

     

       22
       22
       -
             defaultText = lib.literalExpression "pkgs.eris-go";

     

       23
       23
       -
             description = "Package to use for the ERIS server.";

     

       24
       24
       -
           };

     

       25
       25
       -
       

     

       26
       26
       -
           decode = lib.mkOption {

     

       27
       27
       -
             type = lib.types.bool;

     

       28
       28
       -
             default = false;

     

       29
       29
       -
             description = ''

     

       30
       30
       -
               Whether the HTTP service (when enabled) will decode ERIS content at /uri-res/N2R?urn:eris:.

     

       31
       31
       -
               Enabling this is recommended only for private or local-only servers.

     

       32
       32
       -
             '';

     

       33
       33
       -
           };

     

       34
       34
       -
       

     

       35
       35
       -
           listenCoap = lib.mkOption {

     

       36
       36
       -
             type = nullOrStr;

     

       37
       37
       -
             default = ":5683";

     

       38
       38
       -
             example = "[::1]:5683";

     

       39
       39
       -
             description = ''

     

       40
       40
       -
               Server CoAP listen address. Listen on all IP addresses at port 5683 by default.

     

       41
       41
       -
               Please note that the server can service client requests for ERIS-blocks by

     

       42
       42
       -
               querying other clients connected to the server. Whether or not blocks are

     

       43
       43
       -
               relayed back to the server depends on client configuration but be aware this

     

       44
       44
       -
               may leak sensitive metadata and trigger network activity.

     

       45
       45
       -
             '';

     

       46
       46
       -
           };

     

       47
       47
       -
       

     

       48
       48
       -
           listenHttp = lib.mkOption {

     

       49
       49
       -
             type = nullOrStr;

     

       50
       50
       -
             default = null;

     

       51
       51
       -
             example = "[::1]:8080";

     

       52
       52
       -
             description = "Server HTTP listen address. Do not listen by default.";

     

       53
       53
       -
           };

     

       54
       54
       -
       

     

       55
       55
       -
           backends = lib.mkOption {

     

       56
       56
       -
             type = with lib.types; listOf str;

     

       57
       57
       -
             description = ''

     

       58
       58
       -
               List of backend URLs.

     

       59
       59
       -
               Add "get" and "put" as query elements to enable those operations.

     

       60
       60
       -
             '';

     

       61
       61
       -
             example = [

     

       62
       62
       -
               "badger+file:///var/db/eris.badger?get&put"

     

       63
       63
       -
               "coap+tcp://eris.example.com:5683?get"

     

       64
       64
       -
             ];

     

       65
       65
       -
           };

     

       66
       66
       -
       

     

       67
       67
       -
           mountpoint = lib.mkOption {

     

       68
       68
       -
             type = nullOrStr;

     

       69
       69
       -
             default = null;

     

       70
       70
       -
             example = "/eris";

     

       71
       71
       -
             description = ''

     

       72
       72
       -
               Mountpoint for FUSE namespace that exposes "urn:eris:…" files.

     

       73
       73
       -
             '';

     

       74
       74
       -
           };

     

       75
       75
       -
       

     

       76
       76
       -
         };

     

       77
       77
       -
       

     

       78
       78
       -
         config = lib.mkIf cfg.enable {

     

       79
       79
       -
           assertions = [

     

       80
       80
       -
             {

     

       81
       81
       -
               assertion = lib.strings.versionAtLeast cfg.package.version "20231219";

     

       82
       82
       -
               message = "Version of `config.services.eris-server.package` is incompatible with this module";

     

       83
       83
       -
             }

     

       84
       84
       -
           ];

     

       85
       85
       -
       

     

       86
       86
       -
           systemd.services.eris-server =

     

       87
       87
       -
             let

     

       88
       88
       -
               cmd =

     

       89
       89
       -
                 "${cfg.package}/bin/eris-go server"

     

       90
       90
       -
                 + (lib.optionalString (cfg.listenCoap != null) " --coap '${cfg.listenCoap}'")

     

       91
       91
       -
                 + (lib.optionalString (cfg.listenHttp != null) " --http '${cfg.listenHttp}'")

     

       92
       92
       -
                 + (lib.optionalString cfg.decode " --decode")

     

       93
       93
       -
                 + (lib.optionalString (cfg.mountpoint != null) " --mountpoint '${cfg.mountpoint}'");

     

       94
       94
       -
             in

     

       95
       95
       -
             {

     

       96
       96
       -
               description = "ERIS block server";

     

       97
       97
       -
               after = [ "network.target" ];

     

       98
       98
       -
               wantedBy = [ "multi-user.target" ];

     

       99
       99
       -
               environment.ERIS_STORE_URL = toString cfg.backends;

     

       100
       100
       -
               script = lib.mkIf (cfg.mountpoint != null) ''

     

       101
       101
       -
                 export PATH=${config.security.wrapperDir}:$PATH

     

       102
       102
       -
                 ${cmd}

     

       103
       103
       -
               '';

     

       104
       104
       -
               serviceConfig =

     

       105
       105
       -
                 let

     

       106
       106
       -
                   umounter = lib.mkIf (

     

       107
       107
       -
                     cfg.mountpoint != null

     

       108
       108
       -
                   ) "-${config.security.wrapperDir}/fusermount -uz ${cfg.mountpoint}";

     

       109
       109
       -
                 in

     

       110
       110
       -
                 if (cfg.mountpoint == null) then

     

       111
       111
       -
                   {

     

       112
       112
       -
                     ExecStart = cmd;

     

       113
       113
       -
                   }

     

       114
       114
       -
                 else

     

       115
       115
       -
                   {

     

       116
       116
       -
                     ExecStartPre = umounter;

     

       117
       117
       -
                     ExecStopPost = umounter;

     

       118
       118
       -
                   }

     

       119
       119
       -
                   // {

     

       120
       120
       -
                     Restart = "always";

     

       121
       121
       -
                     RestartSec = 20;

     

       122
       122
       -
                     AmbientCapabilities = "CAP_NET_BIND_SERVICE";

     

       123
       123
       -
                   };

     

       124
       124
       -
             };

     

       125
       125
       -
         };

     

       126
       126
       -
       }

-1

nixos/tests/all-tests.nix

···

       493
       493
        
         };

     

       494
       494
        
         ergo = runTest ./ergo.nix;

     

       495
       495
        
         ergochat = runTest ./ergochat.nix;

     

       496
       496
       -
         eris-server = runTest ./eris-server.nix;

     

       497
       496
        
         esphome = runTest ./esphome.nix;

     

       498
       497
        
         etc = pkgs.callPackage ../modules/system/etc/test.nix { inherit evalMinimalConfig; };

     

       499
       498
        
         activation = pkgs.callPackage ../modules/system/activation/test.nix { };

-26

nixos/tests/eris-server.nix

···

       1
       1
       -
       { pkgs, lib, ... }:

     

       2
       2
       -
       {

     

       3
       3
       -
         name = "eris-server";

     

       4
       4
       -
       

     

       5
       5
       -
         nodes.server = {

     

       6
       6
       -
           environment.systemPackages = [

     

       7
       7
       -
             pkgs.eris-go

     

       8
       8
       -
             pkgs.eriscmd

     

       9
       9
       -
           ];

     

       10
       10
       -
           services.eris-server = {

     

       11
       11
       -
             enable = true;

     

       12
       12
       -
             decode = true;

     

       13
       13
       -
             listenHttp = "[::1]:80";

     

       14
       14
       -
             backends = [ "badger+file:///var/cache/eris.badger?get&put" ];

     

       15
       15
       -
             mountpoint = "/eris";

     

       16
       16
       -
           };

     

       17
       17
       -
         };

     

       18
       18
       -
       

     

       19
       19
       -
         testScript = ''

     

       20
       20
       -
           start_all()

     

       21
       21
       -
           server.wait_for_unit("eris-server.service")

     

       22
       22
       -
           server.wait_for_open_port(5683)

     

       23
       23
       -
           server.wait_for_open_port(80)

     

       24
       24
       -
           server.succeed("eriscmd get http://[::1] $(echo 'Hail ERIS!' | eriscmd put coap+tcp://[::1]:5683)")

     

       25
       25
       -
         '';

     

       26
       26
       -
       }