gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/jenkins-job-builder: better defaults for accessUser/accessTokenFile

Browse Source 
The new defaults allows jenkins-job-builder to reload the configuration
out-of-the-box, whereas the previous defaults required users to manually
reload/restart jenkins, or configure accessUser/accessTokenFile
themselves.

(If `extraJavaOptions = [ "-Djenkins.install.runSetupWizard=false" ]`
then the initial admin user is *not* created and you have to use JCasC
or something else to bootstrap.)
This commit is contained in:
Bjørn Forsman
2022-07-26 09:58:24 +02:00
parent a8a8a9e2e7
commit fcf81f91a3
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/continuous-integration/jenkins/job-builder.nix
View File

@@ -30,7 +30,7 @@ in {
}; };
accessUser = mkOption { accessUser = mkOption {
default = ""; default = "admin";
type = types.str; type = types.str;
description = lib.mdDoc '' description = lib.mdDoc ''
User id in Jenkins used to reload config. User id in Jenkins used to reload config.
@@ -48,7 +48,8 @@ in {
}; };
accessTokenFile = mkOption { accessTokenFile = mkOption {
default = ""; default = "${config.services.jenkins.home}/secrets/initialAdminPassword";
defaultText = literalExpression ''"''${config.services.jenkins.home}/secrets/initialAdminPassword"'';
type = types.str; type = types.str;
example = "/run/keys/jenkins-job-builder-access-token"; example = "/run/keys/jenkins-job-builder-access-token";
description = lib.mdDoc '' description = lib.mdDoc ''

2
nixos/tests/jenkins.nix
View File

@@ -18,8 +18,6 @@ import ./make-test-python.nix ({ pkgs, ...} : {
enable = true; enable = true;
jobBuilder = { jobBuilder = {
enable = true; enable = true;
accessUser = "admin";
accessTokenFile = "/var/lib/jenkins/secrets/initialAdminPassword";
nixJobs = [ nixJobs = [
{ job = { { job = {
name = "job-1"; name = "job-1";