aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2017-11-25 02:13:57 +0300
committerIgor Pashev <pashev.igor@gmail.com>2017-11-25 02:15:49 +0300
commitacc13309bbd7ba43106f06e52e98752773281e33 (patch)
tree0c825ac2073203f9f95e8dec680e678958ef5351
parentc4889074c8f4a1110fb1507483d2620cd6818ded (diff)
downloadnixsap-acc13309bbd7ba43106f06e52e98752773281e33.tar.gz
Jenkins app: fix key extraction
Make sure files are captured into Nix store so that Nix daemon can access them and run xinclude2nix (which is still silently ignoring unreachable files).
-rw-r--r--modules/apps/jenkins/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/apps/jenkins/default.nix b/modules/apps/jenkins/default.nix
index c35b851..d6b8b00 100644
--- a/modules/apps/jenkins/default.nix
+++ b/modules/apps/jenkins/default.nix
@@ -20,7 +20,9 @@ let
maybeFile = name: cnt:
let norm = replaceStrings [" "] ["-"] name;
- in if hasPrefix "/" cnt then cnt else pkgs.writeXML norm cnt;
+ in if hasPrefix "/" cnt
+ then "${cnt}"
+ else pkgs.writeXML norm cnt;
configFiles = name: cfg: mapAttrs (n: v: maybeFile "jenkins-${name}-${n}" v) cfg.config;
jobFiles = name: cfg: mapAttrs (n: v: maybeFile "jenkins-${name}-job-${n}.xml" v) cfg.jobs;