summary refs log tree commit diff
path: root/nixos/modules/services/misc/gollum.nix
diff options
context:
space:
mode:
authorAaron Andersen <aaron@fosslib.net>2019-02-23 18:00:03 -0500
committerAaron Andersen <aaron@fosslib.net>2019-05-26 07:20:48 -0400
commit74b34535fc576d40b432549f97ff720751b672f4 (patch)
treecde02423626fdafc161e8b8e4f472c4e47f7a526 /nixos/modules/services/misc/gollum.nix
parent191e4b075547c46449eaefd23b600d42e76d26e8 (diff)
downloadnixpkgs-74b34535fc576d40b432549f97ff720751b672f4.tar
nixpkgs-74b34535fc576d40b432549f97ff720751b672f4.tar.gz
nixpkgs-74b34535fc576d40b432549f97ff720751b672f4.tar.bz2
nixpkgs-74b34535fc576d40b432549f97ff720751b672f4.tar.lz
nixpkgs-74b34535fc576d40b432549f97ff720751b672f4.tar.xz
nixpkgs-74b34535fc576d40b432549f97ff720751b672f4.tar.zst
nixpkgs-74b34535fc576d40b432549f97ff720751b672f4.zip
nixos/gollum: replace deprecated usage of PermissionsStartOnly
see https://github.com/NixOS/nixpkgs/issues/53852
Diffstat (limited to 'nixos/modules/services/misc/gollum.nix')
-rw-r--r--nixos/modules/services/misc/gollum.nix15
1 files changed, 6 insertions, 9 deletions
diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix
index d1823bc6d4d..7653b415bf0 100644
--- a/nixos/modules/services/misc/gollum.nix
+++ b/nixos/modules/services/misc/gollum.nix
@@ -75,27 +75,24 @@ in
 
     users.groups.gollum = { };
 
+    systemd.tmpfiles.rules = [
+      "d '${cfg.stateDir}' - ${config.users.users.gollum.name} ${config.users.groups.gollum.name} - -"
+    ];
+
     systemd.services.gollum = {
       description = "Gollum wiki";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.git ];
 
-      preStart = let
-          userName = config.users.users.gollum.name;
-          groupName = config.users.groups.gollum.name;
-        in ''
-        # All of this is safe to be run on an existing repo
-        mkdir -p ${cfg.stateDir}
+      preStart = ''
+        # This is safe to be run on an existing repo
         git init ${cfg.stateDir}
-        chmod 755 ${cfg.stateDir}
-        chown -R ${userName}:${groupName} ${cfg.stateDir}
       '';
 
       serviceConfig = {
         User = config.users.users.gollum.name;
         Group = config.users.groups.gollum.name;
-        PermissionsStartOnly = true;
         ExecStart = ''
           ${pkgs.gollum}/bin/gollum \
             --port ${toString cfg.port} \