aboutsummaryrefslogtreecommitdiff
path: root/modules/apps
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2017-12-01 20:14:41 +0300
committerIgor Pashev <pashev.igor@gmail.com>2017-12-01 20:14:41 +0300
commit2563de741c8ef1dd9f04bf14e21d489180c8df33 (patch)
tree24b5b1340e2b608957bf657e6b803e5b94d0fd0b /modules/apps
parent82049771b6555bd274b5ad09fcc6659b381cf20a (diff)
downloadnixsap-2563de741c8ef1dd9f04bf14e21d489180c8df33.tar.gz
Jenkins: configure java.util.logging
Diffstat (limited to 'modules/apps')
-rw-r--r--modules/apps/jenkins/default.nix2
-rw-r--r--modules/apps/jenkins/instance.nix1
2 files changed, 3 insertions, 0 deletions
diff --git a/modules/apps/jenkins/default.nix b/modules/apps/jenkins/default.nix
index 8bf230a..bd69477 100644
--- a/modules/apps/jenkins/default.nix
+++ b/modules/apps/jenkins/default.nix
@@ -107,6 +107,8 @@ let
-DJENKINS_HOME='${cfg.home}' \
${optionalString (properties.hudson.model.DirectoryBrowserSupport.CSP != null)
''-Dhudson.model.DirectoryBrowserSupport.CSP="${properties.hudson.model.DirectoryBrowserSupport.CSP}"''} \
+ ${optionalString (properties.java.util.logging.config.file != null)
+ "-Djava.util.logging.config.file='${properties.java.util.logging.config.file}'"} \
-Djava.io.tmpdir='${properties.java.io.tmpdir}' \
-jar '${cfg.war}' \
${concatStringsSep " \\\n " (mapAttrsToList mkOpt (explicit cfg.options))}
diff --git a/modules/apps/jenkins/instance.nix b/modules/apps/jenkins/instance.nix
index cda6462..2c01391 100644
--- a/modules/apps/jenkins/instance.nix
+++ b/modules/apps/jenkins/instance.nix
@@ -28,6 +28,7 @@ in {
properties = {
hudson.model.DirectoryBrowserSupport.CSP = optional str;
java.io.tmpdir = readonly "${config.home}/tmp" path;
+ java.util.logging.config.file = optional path;
};
};