diff options
Diffstat (limited to 'nixpkgs/nixos/modules/services/continuous-integration/jenkins/job-builder.nix')
-rw-r--r-- | nixpkgs/nixos/modules/services/continuous-integration/jenkins/job-builder.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nixpkgs/nixos/modules/services/continuous-integration/jenkins/job-builder.nix b/nixpkgs/nixos/modules/services/continuous-integration/jenkins/job-builder.nix index 8dc06bf26416..d6a8c2a3f7cc 100644 --- a/nixpkgs/nixos/modules/services/continuous-integration/jenkins/job-builder.nix +++ b/nixpkgs/nixos/modules/services/continuous-integration/jenkins/job-builder.nix @@ -30,7 +30,7 @@ in { }; accessUser = mkOption { - default = ""; + default = "admin"; type = types.str; description = lib.mdDoc '' User id in Jenkins used to reload config. @@ -48,7 +48,8 @@ in { }; accessTokenFile = mkOption { - default = ""; + default = "${config.services.jenkins.home}/secrets/initialAdminPassword"; + defaultText = literalExpression ''"''${config.services.jenkins.home}/secrets/initialAdminPassword"''; type = types.str; example = "/run/keys/jenkins-job-builder-access-token"; description = lib.mdDoc '' @@ -241,7 +242,7 @@ in { jobdir="${jenkinsCfg.home}/$jenkinsjobname" rm -rf "$jobdir" done - '' + (if cfg.accessUser != "" then reloadScript else ""); + '' + (optionalString (cfg.accessUser != "") reloadScript); serviceConfig = { Type = "oneshot"; User = jenkinsCfg.user; |