summary refs log tree commit diff
path: root/nixos/modules/services/network-filesystems/ipfs.nix
diff options
context:
space:
mode:
authorAaron Andersen <aaron@fosslib.net>2019-02-24 12:49:02 -0500
committerAaron Andersen <aaron@fosslib.net>2019-04-13 07:00:59 -0400
commitb7f376c01b871f0260015f9246ad2c72d0f0ccfd (patch)
tree3b3cefaf12b6d63c9a708372a4930f6dcb27a920 /nixos/modules/services/network-filesystems/ipfs.nix
parentb1be2f1584ca893b61479b3434ed65bf4f33ed23 (diff)
downloadnixpkgs-b7f376c01b871f0260015f9246ad2c72d0f0ccfd.tar
nixpkgs-b7f376c01b871f0260015f9246ad2c72d0f0ccfd.tar.gz
nixpkgs-b7f376c01b871f0260015f9246ad2c72d0f0ccfd.tar.bz2
nixpkgs-b7f376c01b871f0260015f9246ad2c72d0f0ccfd.tar.lz
nixpkgs-b7f376c01b871f0260015f9246ad2c72d0f0ccfd.tar.xz
nixpkgs-b7f376c01b871f0260015f9246ad2c72d0f0ccfd.tar.zst
nixpkgs-b7f376c01b871f0260015f9246ad2c72d0f0ccfd.zip
nixos/ipfs: replace deprecated usage of PermissionsStartOnly
see https://github.com/NixOS/nixpkgs/issues/53852
Diffstat (limited to 'nixos/modules/services/network-filesystems/ipfs.nix')
-rw-r--r--nixos/modules/services/network-filesystems/ipfs.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index d4fa1eccdf3..f19bf9d8139 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -226,18 +226,19 @@ in {
       ipfs.gid = config.ids.gids.ipfs;
     };
 
+    systemd.tmpfiles.rules = [
+      "d '${cfg.dataDir}' - ${cfg.user} ${cfg.group} - -"
+    ] ++ optionals cfg.autoMount [
+      "d '${cfg.ipfsMountDir}' - ${cfg.user} ${cfg.group} - -"
+      "d '${cfg.ipnsMountDir}' - ${cfg.user} ${cfg.group} - -"
+    ];
+
     systemd.services.ipfs-init = recursiveUpdate commonEnv {
       description = "IPFS Initializer";
 
       after = [ "local-fs.target" ];
       before = [ "ipfs.service" "ipfs-offline.service" "ipfs-norouting.service" ];
 
-      preStart = ''
-        install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir}
-      '' + optionalString cfg.autoMount ''
-        install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.ipfsMountDir}
-        install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.ipnsMountDir}
-      '';
       script = ''
         if [[ ! -f ${cfg.dataDir}/config ]]; then
           ipfs init ${optionalString cfg.emptyRepo "-e"} \
@@ -253,7 +254,6 @@ in {
       serviceConfig = {
         Type = "oneshot";
         RemainAfterExit = true;
-        PermissionsStartOnly = true;
       };
     };