diff options
author | Aaron Andersen <aaron@fosslib.net> | 2020-01-29 18:55:57 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-29 18:55:57 -0500 |
commit | 7adffb14cd129e919ccba8a7a285d409065d4357 (patch) | |
tree | d17ab9281b56a1ff19a266cfe654fd298b53d83b | |
parent | b7c59cc7dc4dd951e8a3ba5fdee0306733e165c9 (diff) | |
parent | b0208cb80f6d9c3d5fd3f9cc0172197d4d682472 (diff) |
Merge pull request #78419 from utsl42/fix-unifi-install
nixos/unifi: use systemd tmpfiles instead of preStart
-rw-r--r-- | nixos/modules/services/networking/unifi.nix | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index c922ba15960fd..4bdfa8143dce0 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -147,8 +147,10 @@ in }) mountPoints; systemd.tmpfiles.rules = [ - "e '${stateDir}' 0700 unifi - - -" + "d '${stateDir}' 0700 unifi - - -" "d '${stateDir}/data' 0700 unifi - - -" + "d '${stateDir}/webapps' 0700 unifi - - -" + "L+ '${stateDir}/webapps/ROOT' - - - - ${cfg.unifiPackage}/webapps/ROOT" ]; systemd.services.unifi = { @@ -161,17 +163,6 @@ in # This a HACK to fix missing dependencies of dynamic libs extracted from jars environment.LD_LIBRARY_PATH = with pkgs.stdenv; "${cc.cc.lib}/lib"; - preStart = '' - # Create the volatile webapps - rm -rf "${stateDir}/webapps" - mkdir -p "${stateDir}/webapps" - ln -s "${cfg.unifiPackage}/webapps/ROOT" "${stateDir}/webapps/ROOT" - ''; - - postStop = '' - rm -rf "${stateDir}/webapps" - ''; - serviceConfig = { Type = "simple"; ExecStart = "${(removeSuffix "\n" cmd)} start"; |