summaryrefslogtreecommitdiffstats
path: root/krebs/3modules
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-02-15 18:46:19 +0100
committertv <tv@krebsco.de>2016-02-15 18:46:19 +0100
commitea910d7d99ec0d36f7f0cc07566dc82ea16f02ca (patch)
tree07de589f91d6f9cb1e87a130e1fe2ea9958c6b14 /krebs/3modules
parent372f2d77f301719e396a6f943657325e2f8b2cf4 (diff)
buildbot: s/lib\.shell/shell/g
Diffstat (limited to 'krebs/3modules')
-rw-r--r--krebs/3modules/buildbot/master.nix4
-rw-r--r--krebs/3modules/buildbot/slave.nix6
2 files changed, 5 insertions, 5 deletions
diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix
index 825cb3413..2a1dbe31a 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 7705ac31c..248b46132 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 {