summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorAaron Andersen <aaron@fosslib.net>2019-02-23 16:05:53 -0500
committerAaron Andersen <aaron@fosslib.net>2019-05-25 13:48:41 -0400
commit86fd8c910db9856ca0a2932c379e02bcc915bf57 (patch)
treed6efa712ec21bf3480d8327b1bb103d2cbd0db70 /nixos
parent42c0ce80e6bb1c27c233ba0ec1fd136bced7b0be (diff)
downloadnixpkgs-86fd8c910db9856ca0a2932c379e02bcc915bf57.tar
nixpkgs-86fd8c910db9856ca0a2932c379e02bcc915bf57.tar.gz
nixpkgs-86fd8c910db9856ca0a2932c379e02bcc915bf57.tar.bz2
nixpkgs-86fd8c910db9856ca0a2932c379e02bcc915bf57.tar.lz
nixpkgs-86fd8c910db9856ca0a2932c379e02bcc915bf57.tar.xz
nixpkgs-86fd8c910db9856ca0a2932c379e02bcc915bf57.tar.zst
nixpkgs-86fd8c910db9856ca0a2932c379e02bcc915bf57.zip
nixos/charybdis: replace deprecated usage of PermissionsStartOnly
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/networking/charybdis.nix9
1 files changed, 4 insertions, 5 deletions
diff --git a/nixos/modules/services/networking/charybdis.nix b/nixos/modules/services/networking/charybdis.nix
index 3d02dc8d137..e3aba063f87 100644
--- a/nixos/modules/services/networking/charybdis.nix
+++ b/nixos/modules/services/networking/charybdis.nix
@@ -83,6 +83,10 @@ in
         gid = config.ids.gids.ircd;
       };
 
+      systemd.tmpfiles.rules = [
+        "d ${cfg.statedir} - ${cfg.user} ${cfg.group} - -"
+      ];
+
       systemd.services.charybdis = {
         description = "Charybdis IRC daemon";
         wantedBy = [ "multi-user.target" ];
@@ -93,12 +97,7 @@ in
           ExecStart   = "${charybdis}/bin/charybdis -foreground -logfile /dev/stdout -configfile ${configFile}";
           Group = cfg.group;
           User = cfg.user;
-          PermissionsStartOnly = true; # preStart needs to run with root permissions
         };
-        preStart = ''
-          ${coreutils}/bin/mkdir -p ${cfg.statedir}
-          ${coreutils}/bin/chown ${cfg.user}:${cfg.group} ${cfg.statedir}
-        '';
       };
 
     }