colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/unifi: Switch command line args to a list

Browse Source 
There's no functionality change here, but this makes it a bit more
convenient to add more args.
This commit is contained in:
Lucas Bergman 2023-11-09 19:41:47 +00:00
parent 2bc02c0383
commit 50ff8ff3f9
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
nixos/modules/services/networking/unifi.nix
View File

@ -2,16 +2,17 @@
let
cfg = config.services.unifi;
stateDir = "/var/lib/unifi";
cmd = ''
@${cfg.jrePackage}/bin/java java \
${lib.optionalString (lib.versionAtLeast (lib.getVersion cfg.jrePackage) "16")
("--add-opens java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED "
+ "--add-opens java.base/sun.security.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED "
+ "--add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED")} \
${lib.optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \
${lib.optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \
-jar ${stateDir}/lib/ace.jar
'';
cmd = lib.escapeShellArgs ([ "@${cfg.jrePackage}/bin/java" "java" ]
++ lib.optionals (lib.versionAtLeast (lib.getVersion cfg.jrePackage) "16") [
"--add-opens=java.base/java.lang=ALL-UNNAMED"
"--add-opens=java.base/java.time=ALL-UNNAMED"
"--add-opens=java.base/sun.security.util=ALL-UNNAMED"
"--add-opens=java.base/java.io=ALL-UNNAMED"
"--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
]
++ (lib.optional (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m")
++ (lib.optional (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m")
++ [ "-jar" "${stateDir}/lib/ace.jar" ]);
in
{
@ -122,8 +123,8 @@ in
serviceConfig = {
Type = "simple";
ExecStart = "${(lib.removeSuffix "\n" cmd)} start";
ExecStop = "${(lib.removeSuffix "\n" cmd)} stop";
ExecStart = "${cmd} start";
ExecStop = "${cmd} stop";
Restart = "on-failure";
TimeoutSec = "5min";
User = "unifi";