summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2016-07-25 21:22:51 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2016-07-26 15:37:24 +0200
commit0a2174f1952799994d053ba71b0b044c8239e2c0 (patch)
tree9b94f18fd8d3baef4cf31acebd3fb69bd91b10af /nixos
parentd5c27859b45a1a6743e2b901b9d40b48e6f810ec (diff)
downloadnixlib-0a2174f1952799994d053ba71b0b044c8239e2c0.tar
nixlib-0a2174f1952799994d053ba71b0b044c8239e2c0.tar.gz
nixlib-0a2174f1952799994d053ba71b0b044c8239e2c0.tar.bz2
nixlib-0a2174f1952799994d053ba71b0b044c8239e2c0.tar.lz
nixlib-0a2174f1952799994d053ba71b0b044c8239e2c0.tar.xz
nixlib-0a2174f1952799994d053ba71b0b044c8239e2c0.tar.zst
nixlib-0a2174f1952799994d053ba71b0b044c8239e2c0.zip
nixos/lighttpd: move cgit setup to cgit.nix
To where it really belongs. Separation of concern.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/web-servers/lighttpd/cgit.nix5
-rw-r--r--nixos/modules/services/web-servers/lighttpd/default.nix6
2 files changed, 5 insertions, 6 deletions
diff --git a/nixos/modules/services/web-servers/lighttpd/cgit.nix b/nixos/modules/services/web-servers/lighttpd/cgit.nix
index c8590e6a54e1..710fecc0c05c 100644
--- a/nixos/modules/services/web-servers/lighttpd/cgit.nix
+++ b/nixos/modules/services/web-servers/lighttpd/cgit.nix
@@ -63,6 +63,11 @@ in
       }
     '';
 
+    systemd.services.lighttpd.preStart = ''
+      mkdir -p /var/cache/cgit
+      chown lighttpd:lighttpd /var/cache/cgit
+    '';
+
   };
 
 }
diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix
index 171503db4eec..84cd0a4095d9 100644
--- a/nixos/modules/services/web-servers/lighttpd/default.nix
+++ b/nixos/modules/services/web-servers/lighttpd/default.nix
@@ -224,12 +224,6 @@ in
       description = "Lighttpd Web Server";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      preStart = ''
-        ${if cfg.cgit.enable then ''
-          mkdir -p /var/cache/cgit
-          chown lighttpd:lighttpd /var/cache/cgit
-        '' else ""}
-      '';
       serviceConfig.ExecStart = "${pkgs.lighttpd}/sbin/lighttpd -D -f ${configFile}";
       # SIGINT => graceful shutdown
       serviceConfig.KillSignal = "SIGINT";