commit 7b60fce8436c3cbaad8220b14dd2345de1e40c4e · pyrox.dev/nixpkgs

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

···

       32
       32
        
       

     

       33
       33
        
       - [stevenblack-blocklist](https://github.com/StevenBlack/hosts), A unified hosts file with base extensions for blocking unwanted websites. Available as [networking.stevenblack](options.html#opt-networking.stevenblack.enable).

     

       34
       34
        
       

     

       35
       35
       +
       - [imaginary](https://github.com/h2non/imaginary), a microservice for high-level image processing that Nextcloud can use to generate previews. Available as [services.imaginary](#opt-services.imaginary.enable).

     

       36
       36
       +
       

     

       35
       37
        
       - [goeland](https://github.com/slurdge/goeland), an alternative to rss2email written in golang with many filters. Available as [services.goeland](#opt-services.goeland.enable).

     

       36
       38
        
       

     

       37
       39
        
       - [atuin](https://github.com/ellie/atuin), a sync server for shell history. Available as [services.atuin](#opt-services.atuin.enable).

nixos/modules/module-list.nix

···

       860
       860
        
         ./services/networking/i2pd.nix

     

       861
       861
        
         ./services/networking/icecream/daemon.nix

     

       862
       862
        
         ./services/networking/icecream/scheduler.nix

     

       863
       863
       +
         ./services/networking/imaginary.nix

     

       863
       864
        
         ./services/networking/inspircd.nix

     

       864
       865
        
         ./services/networking/iodine.nix

     

       865
       866
        
         ./services/networking/iperf3.nix

+110

nixos/modules/services/networking/imaginary.nix

···

       1
       1
       +
       { lib, config, pkgs, utils, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         inherit (lib) mdDoc mkEnableOption mkIf mkOption types;

     

       5
       5
       +
       

     

       6
       6
       +
         cfg = config.services.imaginary;

     

       7
       7
       +
       in {

     

       8
       8
       +
         options.services.imaginary = {

     

       9
       9
       +
           enable = mkEnableOption (mdDoc "imaginary image processing microservice");

     

       10
       10
       +
       

     

       11
       11
       +
           address = mkOption {

     

       12
       12
       +
             type = types.str;

     

       13
       13
       +
             default = "";

     

       14
       14
       +
             description = mdDoc "Bind address. Corresponds to the `-a` flag.";

     

       15
       15
       +
             example = "localhost";

     

       16
       16
       +
           };

     

       17
       17
       +
       

     

       18
       18
       +
           port = mkOption {

     

       19
       19
       +
             type = types.port;

     

       20
       20
       +
             default = 8088;

     

       21
       21
       +
             description = mdDoc "Bind port. Corresponds to the `-p` flag.";

     

       22
       22
       +
           };

     

       23
       23
       +
       

     

       24
       24
       +
           settings = mkOption {

     

       25
       25
       +
             description = mdDoc ''

     

       26
       26
       +
               Command line arguments passed to the imaginary executable, stripped of

     

       27
       27
       +
               the prefix `-`. See upstream's

     

       28
       28
       +
               [README](https://github.com/h2non/imaginary#command-line-usage) for all

     

       29
       29
       +
               options.

     

       30
       30
       +
             '';

     

       31
       31
       +
             type = types.submodule {

     

       32
       32
       +
               freeformType = with types; attrsOf (oneOf [

     

       33
       33
       +
                 bool

     

       34
       34
       +
                 int

     

       35
       35
       +
                 (nonEmptyListOf str)

     

       36
       36
       +
                 str

     

       37
       37
       +
               ]);

     

       38
       38
       +
       

     

       39
       39
       +
               options = {

     

       40
       40
       +
                 return-size = mkOption {

     

       41
       41
       +
                   type = types.bool;

     

       42
       42
       +
                   default = false;

     

       43
       43
       +
                   description = mdDoc "Return the image size in the HTTP headers.";

     

       44
       44
       +
                 };

     

       45
       45
       +
               };

     

       46
       46
       +
             };

     

       47
       47
       +
           };

     

       48
       48
       +
         };

     

       49
       49
       +
       

     

       50
       50
       +
         config = mkIf cfg.enable {

     

       51
       51
       +
           assertions = [ {

     

       52
       52
       +
             assertion = ! lib.hasAttr "a" cfg.settings;

     

       53
       53
       +
             message = "Use services.imaginary.address to specify the -a flag.";

     

       54
       54
       +
           } {

     

       55
       55
       +
             assertion = ! lib.hasAttr "p" cfg.settings;

     

       56
       56
       +
             message = "Use services.imaginary.port to specify the -p flag.";

     

       57
       57
       +
           } ];

     

       58
       58
       +
       

     

       59
       59
       +
           systemd.services.imaginary = {

     

       60
       60
       +
             after = [ "network.target" ];

     

       61
       61
       +
             wantedBy = [ "multi-user.target" ];

     

       62
       62
       +
             serviceConfig = rec {

     

       63
       63
       +
               ExecStart = let

     

       64
       64
       +
                 args = lib.mapAttrsToList (key: val:

     

       65
       65
       +
                   "-" + key + "=" + lib.concatStringsSep "," (map toString (lib.toList val))

     

       66
       66
       +
                 ) (cfg.settings // { a = cfg.address; p = cfg.port; });

     

       67
       67
       +
               in "${pkgs.imaginary}/bin/imaginary ${utils.escapeSystemdExecArgs args}";

     

       68
       68
       +
               ProtectProc = "invisible";

     

       69
       69
       +
               BindReadOnlyPaths = lib.optional (cfg.settings ? mount) cfg.settings.mount;

     

       70
       70
       +
               CapabilityBoundingSet = if cfg.port < 1024 then

     

       71
       71
       +
                 [ "CAP_NET_BIND_SERVICE" ]

     

       72
       72
       +
               else

     

       73
       73
       +
                 [ "" ];

     

       74
       74
       +
               AmbientCapabilities = CapabilityBoundingSet;

     

       75
       75
       +
               NoNewPrivileges = true;

     

       76
       76
       +
               DynamicUser = true;

     

       77
       77
       +
               ProtectSystem = "strict";

     

       78
       78
       +
               ProtectHome = true;

     

       79
       79
       +
               TemporaryFileSystem = [ "/:ro" ];

     

       80
       80
       +
               PrivateTmp = true;

     

       81
       81
       +
               PrivateDevices = true;

     

       82
       82
       +
               PrivateUsers = cfg.port >= 1024;

     

       83
       83
       +
               ProtectHostname = true;

     

       84
       84
       +
               ProtectClock = true;

     

       85
       85
       +
               ProtectKernelTunables = true;

     

       86
       86
       +
               ProtectKernelModules = true;

     

       87
       87
       +
               ProtectKernelLogs = true;

     

       88
       88
       +
               ProtectControlGroups = true;

     

       89
       89
       +
               RestrictAddressFamilies = [

     

       90
       90
       +
                 "AF_INET"

     

       91
       91
       +
                 "AF_INET6"

     

       92
       92
       +
               ];

     

       93
       93
       +
               RestrictNamespaces = true;

     

       94
       94
       +
               LockPersonality = true;

     

       95
       95
       +
               MemoryDenyWriteExecute = true;

     

       96
       96
       +
               RestrictRealtime = true;

     

       97
       97
       +
               PrivateMounts = true;

     

       98
       98
       +
               SystemCallFilter = [

     

       99
       99
       +
                 "@system-service"

     

       100
       100
       +
                 "~@privileged"

     

       101
       101
       +
               ];

     

       102
       102
       +
               DevicePolicy = "closed";

     

       103
       103
       +
             };

     

       104
       104
       +
           };

     

       105
       105
       +
         };

     

       106
       106
       +
       

     

       107
       107
       +
         meta = {

     

       108
       108
       +
           maintainers = with lib.maintainers; [ dotlambda ];

     

       109
       109
       +
         };

     

       110
       110
       +
       }

+18 -2

pkgs/servers/imaginary/default.nix

···

       1
       1
       -
       { lib, buildGoModule, fetchFromGitHub, pkg-config, vips }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildGoModule

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , fetchpatch

     

       5
       5
       +
       , pkg-config

     

       6
       6
       +
       , vips

     

       7
       7
       +
       }:

     

       2
       8
        
       

     

       3
       9
        
       buildGoModule rec {

     

       4
       10
        
         pname = "imaginary";

     
···

       11
       17
        
           hash = "sha256-oEkFoZMaNNJPMisqpIneeLK/sA23gaTWJ4nqtDHkrwA=";

     

       12
       18
        
         };

     

       13
       19
        
       

     

       20
       20
       +
         patches = [

     

       21
       21
       +
           # add -return-size flag recommend by Nextcloud

     

       22
       22
       +
           # https://github.com/h2non/imaginary/pull/382

     

       23
       23
       +
           (fetchpatch {

     

       24
       24
       +
             name = "return-width-and-height-of-generated-images.patch";

     

       25
       25
       +
             url = "https://github.com/h2non/imaginary/commit/cfbf8d724cd326e835dfcb01e7224397c46037d3.patch";

     

       26
       26
       +
             hash = "sha256-TwZ5WU5g9LXrenpfY52jYsc6KsEt2fjDq7cPz6ILlhA=";

     

       27
       27
       +
           })

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       14
       30
        
         vendorHash = "sha256-BluY6Fz4yAKJ/A9aFuPPsgQN9N/5yd8g8rDfIZeYz5U=";

     

       15
       31
        
       

     

       16
       32
        
         buildInputs = [ vips ];

     
···

       28
       44
        
           changelog = "https://github.com/h2non/${pname}/releases/tag/v${version}";

     

       29
       45
        
           description = "Fast, simple, scalable, Docker-ready HTTP microservice for high-level image processing";

     

       30
       46
        
           license = licenses.mit;

     

       31
       31
       -
           maintainers = with maintainers; [ urandom ];

     

       47
       47
       +
           maintainers = with maintainers; [ dotlambda urandom ];

     

       32
       48
        
         };

     

       33
       49
        
       }