From a94a4c42065fb2fd489a03fd7b0db60ebabb8ebf Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 15 Feb 2016 17:43:30 +0100
Subject: s 1 wolf: use config.krebs.lib

---
 krebs/3modules/buildbot/master.nix | 4 ++--
 krebs/3modules/buildbot/slave.nix  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'krebs/3modules/buildbot')

diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix
index 825cb341..080a1f33 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..0375e802 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 {
-- 
cgit v1.2.3