commit decaa2e7bf88b27fbebeda72e69c032533afb0a8 · pyrox.dev/nixpkgs

+24 -28

nixos/modules/services/network-filesystems/ipfs.nix

···

       6
        
         cfg = config.services.ipfs;

     

       7
        
       

     

       8
        
         ipfsFlags = toString ([

     

       9
       -
           #(optionalString  cfg.autoMount                   "--mount")

     

       10
        
           (optionalString  cfg.autoMigrate                 "--migrate")

     

       11
        
           (optionalString  cfg.enableGC                    "--enable-gc")

     

       12
        
           (optionalString (cfg.serviceFdlimit != null)     "--manage-fdlimit=false")

     
···

       37
        
         baseService = recursiveUpdate commonEnv {

     

       38
        
           wants = [ "ipfs-init.service" ];

     

       39
        
           preStart = ''

     

       0
        
       
     

       40
        
             ipfs --local config Addresses.API ${cfg.apiAddress}

     

       41
        
             ipfs --local config Addresses.Gateway ${cfg.gatewayAddress}

     

       42
       -
           '' + optionalString false/*cfg.autoMount*/ ''

     

       43
        
             ipfs --local config Mounts.FuseAllowOther --json true

     

       44
        
             ipfs --local config Mounts.IPFS ${cfg.ipfsMountDir}

     

       45
        
             ipfs --local config Mounts.IPNS ${cfg.ipnsMountDir}

     
···

       91
        
             };

     

       92
        
       

     

       93
        
             defaultMode = mkOption {

     

       94
       -
               description = "systemd service that is enabled by default";

     

       95
        
               type = types.enum [ "online" "offline" "norouting" ];

     

       96
        
               default = "online";

     

       0
        
       
     

       97
        
             };

     

       98
        
       

     

       99
        
             autoMigrate = mkOption {

     

       100
        
               type = types.bool;

     

       101
        
               default = false;

     

       102
       -
               description = ''

     

       103
       -
                 Whether IPFS should try to migrate the file system automatically.

     

       104
       -
               '';

     

       105
        
             };

     

       106
        
       

     

       107
       -
             #autoMount = mkOption {

     

       108
       -
             #  type = types.bool;

     

       109
       -
             #  default = false;

     

       110
       -
             #  description = "Whether IPFS should try to mount /ipfs and /ipns at startup.";

     

       111
       -
             #};

     

       112
        
       

     

       113
        
             ipfsMountDir = mkOption {

     

       114
        
               type = types.str;

     
···

       137
        
             enableGC = mkOption {

     

       138
        
               type = types.bool;

     

       139
        
               default = false;

     

       140
       -
               description = ''

     

       141
       -
                 Whether to enable automatic garbage collection.

     

       142
       -
               '';

     

       143
        
             };

     

       144
        
       

     

       145
        
             emptyRepo = mkOption {

     

       146
        
               type = types.bool;

     

       147
        
               default = false;

     

       148
       -
               description = ''

     

       149
       -
                 If set to true, the repo won't be initialized with help files

     

       150
       -
               '';

     

       151
        
             };

     

       152
        
       

     

       153
        
             extraConfig = mkOption {

     

       154
        
               type = types.attrs;

     

       155
       -
               description = toString [

     

       156
       -
                 "Attrset of daemon configuration to set using `ipfs config`, every time the daemon starts."

     

       157
       -
                 "These are applied last, so may override configuration set by other options in this module."

     

       158
       -
                 "Keep in mind that this configuration is stateful; i.e., unsetting anything in here does not reset the value to the default!"

     

       159
       -
               ];

     

       160
        
               default = {};

     

       161
        
               example = {

     

       162
        
                 Datastore.StorageMax = "100GB";

     
···

       179
        
             serviceFdlimit = mkOption {

     

       180
        
               type = types.nullOr types.int;

     

       181
        
               default = null;

     

       182
       -
               description = ''

     

       183
       -
                 The fdlimit for the IPFS systemd unit or `null` to have the daemon attempt to manage it.

     

       184
       -
               '';

     

       185
       -
               example = 256*1024;

     

       186
        
             };

     

       187
        
       

     

       188
        
           };

     
···

       192
        
       

     

       193
        
         config = mkIf cfg.enable {

     

       194
        
           environment.systemPackages = [ wrapped ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       195
        
       

     

       196
        
           users.extraUsers = mkIf (cfg.user == "ipfs") {

     

       197
        
             ipfs = {

     
···

       211
        
             description = "IPFS Initializer";

     

       212
        
       

     

       213
        
             after = [ "local-fs.target" ];

     

       214
       -
             before = [ "ipfs.service" "ipfs-offline.service" ];

     

       215
        
       

     

       216
        
             preStart = ''

     

       217
        
               install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir}

     

       218
       -
             '' + optionalString false/*cfg.autoMount*/ ''

     

       219
        
               install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.ipfsMountDir}

     

       220
        
               install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.ipnsMountDir}

     

       221
        
             '';

···

       6
        
         cfg = config.services.ipfs;

     

       7
        
       

     

       8
        
         ipfsFlags = toString ([

     

       9
       +
           (optionalString  cfg.autoMount                   "--mount")

     

       10
        
           (optionalString  cfg.autoMigrate                 "--migrate")

     

       11
        
           (optionalString  cfg.enableGC                    "--enable-gc")

     

       12
        
           (optionalString (cfg.serviceFdlimit != null)     "--manage-fdlimit=false")

     
···

       37
        
         baseService = recursiveUpdate commonEnv {

     

       38
        
           wants = [ "ipfs-init.service" ];

     

       39
        
           preStart = ''

     

       40
       +
             ipfs repo fsck # workaround for BUG #4212 (https://github.com/ipfs/go-ipfs/issues/4214)

     

       41
        
             ipfs --local config Addresses.API ${cfg.apiAddress}

     

       42
        
             ipfs --local config Addresses.Gateway ${cfg.gatewayAddress}

     

       43
       +
           '' + optionalString cfg.autoMount ''

     

       44
        
             ipfs --local config Mounts.FuseAllowOther --json true

     

       45
        
             ipfs --local config Mounts.IPFS ${cfg.ipfsMountDir}

     

       46
        
             ipfs --local config Mounts.IPNS ${cfg.ipnsMountDir}

     
···

       92
        
             };

     

       93
        
       

     

       94
        
             defaultMode = mkOption {

     

       0
        
       
     

       95
        
               type = types.enum [ "online" "offline" "norouting" ];

     

       96
        
               default = "online";

     

       97
       +
               description = "systemd service that is enabled by default";

     

       98
        
             };

     

       99
        
       

     

       100
        
             autoMigrate = mkOption {

     

       101
        
               type = types.bool;

     

       102
        
               default = false;

     

       103
       +
               description = "Whether IPFS should try to migrate the file system automatically";

     

       0
        
       
     

       0
        
       
     

       104
        
             };

     

       105
        
       

     

       106
       +
             autoMount = mkOption {

     

       107
       +
               type = types.bool;

     

       108
       +
               default = false;

     

       109
       +
               description = "Whether IPFS should try to mount /ipfs and /ipns at startup.";

     

       110
       +
             };

     

       111
        
       

     

       112
        
             ipfsMountDir = mkOption {

     

       113
        
               type = types.str;

     
···

       136
        
             enableGC = mkOption {

     

       137
        
               type = types.bool;

     

       138
        
               default = false;

     

       139
       +
               description = "Whether to enable automatic garbage collection";

     

       0
        
       
     

       0
        
       
     

       140
        
             };

     

       141
        
       

     

       142
        
             emptyRepo = mkOption {

     

       143
        
               type = types.bool;

     

       144
        
               default = false;

     

       145
       +
               description = "If set to true, the repo won't be initialized with help files";

     

       0
        
       
     

       0
        
       
     

       146
        
             };

     

       147
        
       

     

       148
        
             extraConfig = mkOption {

     

       149
        
               type = types.attrs;

     

       150
       +
               description = ''

     

       151
       +
                 Attrset of daemon configuration to set using <command>ipfs config</command>, every time the daemon starts.

     

       152
       +
                 These are applied last, so may override configuration set by other options in this module.

     

       153
       +
                 Keep in mind that this configuration is stateful; i.e., unsetting anything in here does not reset the value to the default!

     

       154
       +
               '';

     

       155
        
               default = {};

     

       156
        
               example = {

     

       157
        
                 Datastore.StorageMax = "100GB";

     
···

       174
        
             serviceFdlimit = mkOption {

     

       175
        
               type = types.nullOr types.int;

     

       176
        
               default = null;

     

       177
       +
               description = "The fdlimit for the IPFS systemd unit or <literal>null</literal> to have the daemon attempt to manage it";

     

       178
       +
               example = 64*1024;

     

       0
        
       
     

       0
        
       
     

       179
        
             };

     

       180
        
       

     

       181
        
           };

     
···

       185
        
       

     

       186
        
         config = mkIf cfg.enable {

     

       187
        
           environment.systemPackages = [ wrapped ];

     

       188
       +
           environment.etc."fuse.conf" = mkIf cfg.autoMount { text = ''

     

       189
       +
             user_allow_other

     

       190
       +
           ''; };

     

       191
        
       

     

       192
        
           users.extraUsers = mkIf (cfg.user == "ipfs") {

     

       193
        
             ipfs = {

     
···

       207
        
             description = "IPFS Initializer";

     

       208
        
       

     

       209
        
             after = [ "local-fs.target" ];

     

       210
       +
             before = [ "ipfs.service" "ipfs-offline.service" "ipfs-norouting.service" ];

     

       211
        
       

     

       212
        
             preStart = ''

     

       213
        
               install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir}

     

       214
       +
             '' + optionalString cfg.autoMount ''

     

       215
        
               install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.ipfsMountDir}

     

       216
        
               install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.ipnsMountDir}

     

       217
        
             '';

+2 -4

nixos/tests/ipfs.nix

···

       23
        
               services.ipfs = {

     

       24
        
                 enable = true;

     

       25
        
                 defaultMode = "norouting";

     

       26
       -
                 # not yet. See #28621

     

       27
       -
                 #autoMount = true;

     

       28
        
               };

     

       29
        
               networking.firewall.allowedTCPPorts = [ 4001 ];

     

       30
        
             };

     
···

       51
        
       

     

       52
        
           $getter->mustSucceed("ipfs --api /ip4/127.0.0.1/tcp/5001 swarm connect /ip4/$addrIp/tcp/4001/ipfs/$addrId");

     

       53
        
           $getter->mustSucceed("[ -n \"\$(ipfs --api /ip4/127.0.0.1/tcp/5001 cat /ipfs/$ipfsHash | grep fnord)\" ]");

     

       54
       -
           # not yet. See #28621

     

       55
       -
           # $getter->mustSucceed("[ -n \"$(cat /ipfs/$ipfsHash | grep fnord)\" ]");

     

       56
        
           '';

     

       57
        
       })

···

       23
        
               services.ipfs = {

     

       24
        
                 enable = true;

     

       25
        
                 defaultMode = "norouting";

     

       26
       +
                 autoMount = true;

     

       0
        
       
     

       27
        
               };

     

       28
        
               networking.firewall.allowedTCPPorts = [ 4001 ];

     

       29
        
             };

     
···

       50
        
       

     

       51
        
           $getter->mustSucceed("ipfs --api /ip4/127.0.0.1/tcp/5001 swarm connect /ip4/$addrIp/tcp/4001/ipfs/$addrId");

     

       52
        
           $getter->mustSucceed("[ -n \"\$(ipfs --api /ip4/127.0.0.1/tcp/5001 cat /ipfs/$ipfsHash | grep fnord)\" ]");

     

       53
       +
           $getter->mustSucceed("[ -n \"$(cat /ipfs/$ipfsHash | grep fnord)\" ]");

     

       0
        
       
     

       54
        
           '';

     

       55
        
       })