From 2563de741c8ef1dd9f04bf14e21d489180c8df33 Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Fri, 1 Dec 2017 20:14:41 +0300
Subject: Jenkins: configure java.util.logging

---
 modules/apps/jenkins/default.nix  | 2 ++
 modules/apps/jenkins/instance.nix | 1 +
 2 files changed, 3 insertions(+)

(limited to 'modules/apps')

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;
       };
     };
 
-- 
cgit v1.2.3