diff options
author | Guillaume Maudoux <layus.on@gmail.com> | 2016-02-01 10:18:31 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-02-03 12:42:01 +0100 |
commit | 9f358f809d1db46f3206d4a09a5366f13c93e777 (patch) | |
tree | dfa95476fff3c1e9d77d79608b744ba29596ae07 /nixos/modules/services/continuous-integration/jenkins/default.nix | |
parent | 0876a44169b64d4108fc5b5bd3c96843f94a4990 (diff) | |
download | nixpkgs-9f358f809d1db46f3206d4a09a5366f13c93e777.tar nixpkgs-9f358f809d1db46f3206d4a09a5366f13c93e777.tar.gz nixpkgs-9f358f809d1db46f3206d4a09a5366f13c93e777.tar.bz2 nixpkgs-9f358f809d1db46f3206d4a09a5366f13c93e777.tar.lz nixpkgs-9f358f809d1db46f3206d4a09a5366f13c93e777.tar.xz nixpkgs-9f358f809d1db46f3206d4a09a5366f13c93e777.tar.zst nixpkgs-9f358f809d1db46f3206d4a09a5366f13c93e777.zip |
Configure a default trust store for openssl
Diffstat (limited to 'nixos/modules/services/continuous-integration/jenkins/default.nix')
-rw-r--r-- | nixos/modules/services/continuous-integration/jenkins/default.nix | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index d6ae4b45cee..cfb1cd773c7 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -92,11 +92,12 @@ in { type = with types; attrsOf str; description = '' Additional environment variables to be passed to the jenkins process. - As a base environment, jenkins receives NIX_PATH, SSL_CERT_FILE and - GIT_SSL_CAINFO from <option>environment.sessionVariables</option>, - NIX_REMOTE is set to "daemon" and JENKINS_HOME is set to - the value of <option>services.jenkins.home</option>. This option has - precedence and can be used to override those mentioned variables. + As a base environment, jenkins receives NIX_PATH from + <option>environment.sessionVariables</option>, NIX_REMOTE is set to + "daemon" and JENKINS_HOME is set to the value of + <option>services.jenkins.home</option>. + This option has precedence and can be used to override those + mentioned variables. ''; }; @@ -136,11 +137,7 @@ in { environment = let selectedSessionVars = - lib.filterAttrs (n: v: builtins.elem n - [ "NIX_PATH" - "SSL_CERT_FILE" - "GIT_SSL_CAINFO" - ]) + lib.filterAttrs (n: v: builtins.elem n [ "NIX_PATH" ]) config.environment.sessionVariables; in selectedSessionVars // |