diff options
| author | lassulus <lass@aidsballs.de> | 2016-02-17 15:02:45 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-02-17 15:02:45 +0100 |
| commit | f48e90915f9c1477a7068050e06a8686ceb03427 (patch) | |
| tree | 7f3cb5987b2f962fa7f93ffab0c8d47267f70764 /krebs/3modules/buildbot | |
| parent | 5c8606e6f6b9337d6f9c1241bf0af84af9db0bdf (diff) | |
| parent | d923ede6e33c57901039da59d50c45938228fd7a (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs/3modules/buildbot')
| -rw-r--r-- | krebs/3modules/buildbot/master.nix | 4 | ||||
| -rw-r--r-- | krebs/3modules/buildbot/slave.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix index 825cb341..2a1dbe31 100644 --- a/krebs/3modules/buildbot/master.nix +++ b/krebs/3modules/buildbot/master.nix @@ -338,8 +338,8 @@ let SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; }; serviceConfig = let - workdir="${lib.shell.escape cfg.workDir}"; - secretsdir="${lib.shell.escape (toString <secrets>)}"; + workdir = shell.escape cfg.workDir; + secretsdir = shell.escape (toString <secrets>); in { PermissionsStartOnly = true; Type = "forking"; diff --git a/krebs/3modules/buildbot/slave.nix b/krebs/3modules/buildbot/slave.nix index 7705ac31..248b4613 100644 --- a/krebs/3modules/buildbot/slave.nix +++ b/krebs/3modules/buildbot/slave.nix @@ -149,9 +149,9 @@ let } // cfg.extraEnviron; serviceConfig = let - workdir = "${lib.shell.escape cfg.workDir}"; - contact = "${lib.shell.escape cfg.contact}"; - description = "${lib.shell.escape cfg.description}"; + workdir = shell.escape cfg.workDir; + contact = shell.escape cfg.contact; + description = shell.escape cfg.description; buildbot = pkgs.buildbot-slave; # TODO:make this in { |