summary refs log tree commit diff
path: root/nixos/modules/services/network-filesystems
diff options
context:
space:
mode:
authorEric Litak <elitak@gmail.com>2017-09-29 18:07:35 -0700
committerEric Litak <elitak@gmail.com>2017-09-29 18:07:55 -0700
commitf46616db5a4c9632b4c8ab945ede2eb0affe839d (patch)
tree531d4c8c076125c395d0702b7facbd9d948764ff /nixos/modules/services/network-filesystems
parentb76f9d7a4487f6762791e4fa7966b44451de4fe3 (diff)
downloadnixlib-f46616db5a4c9632b4c8ab945ede2eb0affe839d.tar
nixlib-f46616db5a4c9632b4c8ab945ede2eb0affe839d.tar.gz
nixlib-f46616db5a4c9632b4c8ab945ede2eb0affe839d.tar.bz2
nixlib-f46616db5a4c9632b4c8ab945ede2eb0affe839d.tar.lz
nixlib-f46616db5a4c9632b4c8ab945ede2eb0affe839d.tar.xz
nixlib-f46616db5a4c9632b4c8ab945ede2eb0affe839d.tar.zst
nixlib-f46616db5a4c9632b4c8ab945ede2eb0affe839d.zip
ipfs: disable autoMigrate option for now
Diffstat (limited to 'nixos/modules/services/network-filesystems')
-rw-r--r--nixos/modules/services/network-filesystems/ipfs.nix11
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;