diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-10-04 03:07:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-04 03:07:25 +0200 |
| commit | d6f7e2f6f6e4068b43c4779ea968550f10544b0d (patch) | |
| tree | f212b5852cdcfa2928060c6ce65147d09d3ded04 /nixos/modules/services/network-filesystems | |
| parent | dd32b3f9cc8b466468ba8263776b9979c26e067d (diff) | |
| parent | f46616db5a4c9632b4c8ab945ede2eb0affe839d (diff) | |
| download | nixlib-d6f7e2f6f6e4068b43c4779ea968550f10544b0d.tar nixlib-d6f7e2f6f6e4068b43c4779ea968550f10544b0d.tar.gz nixlib-d6f7e2f6f6e4068b43c4779ea968550f10544b0d.tar.bz2 nixlib-d6f7e2f6f6e4068b43c4779ea968550f10544b0d.tar.lz nixlib-d6f7e2f6f6e4068b43c4779ea968550f10544b0d.tar.xz nixlib-d6f7e2f6f6e4068b43c4779ea968550f10544b0d.tar.zst nixlib-d6f7e2f6f6e4068b43c4779ea968550f10544b0d.zip | |
Merge pull request #29942 from elitak/ipfs
Ipfs: prepare for autoMigrate fix
Diffstat (limited to 'nixos/modules/services/network-filesystems')
| -rw-r--r-- | nixos/modules/services/network-filesystems/ipfs.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 36e5efecf431..d4a695ef5880 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -7,7 +7,7 @@ let ipfsFlags = toString ([ (optionalString cfg.autoMount "--mount") - (optionalString cfg.autoMigrate "--migrate") + #(optionalString cfg.autoMigrate "--migrate") (optionalString cfg.enableGC "--enable-gc") (optionalString (cfg.serviceFdlimit != null) "--manage-fdlimit=false") (optionalString (cfg.defaultMode == "offline") "--offline") @@ -36,6 +36,7 @@ let baseService = recursiveUpdate commonEnv { wants = [ "ipfs-init.service" ]; + # NB: migration must be performed prior to pre-start, else we get the failure message! preStart = '' ipfs repo fsck # workaround for BUG #4212 (https://github.com/ipfs/go-ipfs/issues/4214) ipfs --local config Addresses.API ${cfg.apiAddress} @@ -97,11 +98,17 @@ in { description = "systemd service that is enabled by default"; }; + /* autoMigrate = mkOption { type = types.bool; default = false; - description = "Whether IPFS should try to migrate the file system automatically"; + description = '' + Whether IPFS should try to migrate the file system automatically. + + The daemon will need to be able to download a binary from https://ipfs.io to perform the migration. + ''; }; + */ autoMount = mkOption { type = types.bool; |