about summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorAaron Andersen <aaron@fosslib.net>2019-03-17 21:37:45 -0400
committerAaron Andersen <aaron@fosslib.net>2019-04-13 07:00:59 -0400
commitb1be2f1584ca893b61479b3434ed65bf4f33ed23 (patch)
treecb6fb06f2eea65e48167f2cc3491dd004fcda94a /nixos/modules/services
parent6ac630bad3f2ba002548c57a763df91af8c185cf (diff)
downloadnixlib-b1be2f1584ca893b61479b3434ed65bf4f33ed23.tar
nixlib-b1be2f1584ca893b61479b3434ed65bf4f33ed23.tar.gz
nixlib-b1be2f1584ca893b61479b3434ed65bf4f33ed23.tar.bz2
nixlib-b1be2f1584ca893b61479b3434ed65bf4f33ed23.tar.lz
nixlib-b1be2f1584ca893b61479b3434ed65bf4f33ed23.tar.xz
nixlib-b1be2f1584ca893b61479b3434ed65bf4f33ed23.tar.zst
nixlib-b1be2f1584ca893b61479b3434ed65bf4f33ed23.zip
nixos/influxdb: replace deprecated usage of PermissionsStartOnly
see https://github.com/NixOS/nixpkgs/issues/53852
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/databases/influxdb.nix13
1 files changed, 6 insertions, 7 deletions
diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix
index 888bf13c3df8..6868050c8446 100644
--- a/nixos/modules/services/databases/influxdb.nix
+++ b/nixos/modules/services/databases/influxdb.nix
@@ -157,20 +157,19 @@ in
 
   config = mkIf config.services.influxdb.enable {
 
+    systemd.tmpfiles.rules = [
+      "d '${cfg.dataDir}' 0770 ${cfg.user} ${cfg.group} - -"
+    ];
+
     systemd.services.influxdb = {
       description = "InfluxDB Server";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
       serviceConfig = {
         ExecStart = ''${cfg.package}/bin/influxd -config "${configFile}"'';
-        User = "${cfg.user}";
-        Group = "${cfg.group}";
-        PermissionsStartOnly = true;
+        User = cfg.user;
+        Group = cfg.group;
       };
-      preStart = ''
-        mkdir -m 0770 -p ${cfg.dataDir}
-        if [ "$(id -u)" = 0 ]; then chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}; fi
-      '';
       postStart =
         let
           scheme = if configOptions.http.https-enabled then "-k https" else "http";