commit decaa2e7bf88b27fbebeda72e69c032533afb0a8 · pyrox.dev/nixpkgs

+24 -28

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

···

       6
       6
        
         cfg = config.services.ipfs;

     

       7
       7
        
       

     

       8
       8
        
         ipfsFlags = toString ([

     

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

     

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

     

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

     

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

     

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

     
···

       37
       37
        
         baseService = recursiveUpdate commonEnv {

     

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

     

       39
       39
        
           preStart = ''

     

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

     

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

     

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

     

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

     

       43
       43
       +
           '' + optionalString cfg.autoMount ''

     

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

     

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

     

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

     
···

       91
       92
        
             };

     

       92
       93
        
       

     

       93
       94
        
             defaultMode = mkOption {

     

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

     

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

     

       96
       96
        
               default = "online";

     

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

     

       97
       98
        
             };

     

       98
       99
        
       

     

       99
       100
        
             autoMigrate = mkOption {

     

       100
       101
        
               type = types.bool;

     

       101
       102
        
               default = false;

     

       102
       102
       -
               description = ''

     

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

     

       104
       104
       -
               '';

     

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

     

       105
       104
        
             };

     

       106
       105
        
       

     

       107
       107
       -
             #autoMount = mkOption {

     

       108
       108
       -
             #  type = types.bool;

     

       109
       109
       -
             #  default = false;

     

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

     

       111
       111
       -
             #};

     

       106
       106
       +
             autoMount = mkOption {

     

       107
       107
       +
               type = types.bool;

     

       108
       108
       +
               default = false;

     

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

     

       110
       110
       +
             };

     

       112
       111
        
       

     

       113
       112
        
             ipfsMountDir = mkOption {

     

       114
       113
        
               type = types.str;

     
···

       137
       136
        
             enableGC = mkOption {

     

       138
       137
        
               type = types.bool;

     

       139
       138
        
               default = false;

     

       140
       140
       -
               description = ''

     

       141
       141
       -
                 Whether to enable automatic garbage collection.

     

       142
       142
       -
               '';

     

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

     

       143
       140
        
             };

     

       144
       141
        
       

     

       145
       142
        
             emptyRepo = mkOption {

     

       146
       143
        
               type = types.bool;

     

       147
       144
        
               default = false;

     

       148
       148
       -
               description = ''

     

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

     

       150
       150
       -
               '';

     

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

     

       151
       146
        
             };

     

       152
       147
        
       

     

       153
       148
        
             extraConfig = mkOption {

     

       154
       149
        
               type = types.attrs;

     

       155
       155
       -
               description = toString [

     

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

     

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

     

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

     

       159
       159
       -
               ];

     

       150
       150
       +
               description = ''

     

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

     

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

     

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

     

       154
       154
       +
               '';

     

       160
       155
        
               default = {};

     

       161
       156
        
               example = {

     

       162
       157
        
                 Datastore.StorageMax = "100GB";

     
···

       179
       174
        
             serviceFdlimit = mkOption {

     

       180
       175
        
               type = types.nullOr types.int;

     

       181
       176
        
               default = null;

     

       182
       182
       -
               description = ''

     

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

     

       184
       184
       -
               '';

     

       185
       185
       -
               example = 256*1024;

     

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

     

       178
       178
       +
               example = 64*1024;

     

       186
       179
        
             };

     

       187
       180
        
       

     

       188
       181
        
           };

     
···

       192
       185
        
       

     

       193
       186
        
         config = mkIf cfg.enable {

     

       194
       187
        
           environment.systemPackages = [ wrapped ];

     

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

     

       189
       189
       +
             user_allow_other

     

       190
       190
       +
           ''; };

     

       195
       191
        
       

     

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

     

       197
       193
        
             ipfs = {

     
···

       211
       207
        
             description = "IPFS Initializer";

     

       212
       208
        
       

     

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

     

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

     

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

     

       215
       211
        
       

     

       216
       212
        
             preStart = ''

     

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

     

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

     

       214
       214
       +
             '' + optionalString cfg.autoMount ''

     

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

     

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

     

       221
       217
        
             '';

+2 -4

nixos/tests/ipfs.nix

···

       23
       23
        
               services.ipfs = {

     

       24
       24
        
                 enable = true;

     

       25
       25
        
                 defaultMode = "norouting";

     

       26
       26
       -
                 # not yet. See #28621

     

       27
       27
       -
                 #autoMount = true;

     

       26
       26
       +
                 autoMount = true;

     

       28
       27
        
               };

     

       29
       28
        
               networking.firewall.allowedTCPPorts = [ 4001 ];

     

       30
       29
        
             };

     
···

       51
       50
        
       

     

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

     

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

     

       54
       54
       -
           # not yet. See #28621

     

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

     

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

     

       56
       54
        
           '';

     

       57
       55
        
       })