summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanne Heß <janne@hess.ooo>2021-12-13 12:05:46 +0100
committerGitHub <noreply@github.com>2021-12-13 12:05:46 +0100
commitc00268dcd7a065aba6f38d913dd86d9ec54d7cf2 (patch)
tree956288010d4e5d34cc38f157c2cde656fd4ad7e3
parentMerge pull request #150466 from Ma27/grafana-security-21.05 (diff)
parentnixos/unifi: Apply log4j2 mitigation (diff)
downloadnixpkgs-c00268dcd7a065aba6f38d913dd86d9ec54d7cf2.tar.gz
Merge pull request #150426 from pennae/backport-150329-to-release-21.05
-rw-r--r--nixos/modules/services/networking/unifi.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix
index 62bcf7a14972..1ccaa259295b 100644
--- a/nixos/modules/services/networking/unifi.nix
+++ b/nixos/modules/services/networking/unifi.nix
@@ -7,6 +7,7 @@ let
@${cfg.jrePackage}/bin/java java \
${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \
${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \
+ ${optionalString (lib.versionOlder cfg.unifiPackage.version "6.5.54") "-Dlog4j2.formatMsgNoLookups=true"} \
-jar ${stateDir}/lib/ace.jar
'';
mountPoints = [