summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--krebs/3modules/buildbot/master.nix4
-rw-r--r--krebs/3modules/buildbot/slave.nix6
-rw-r--r--shared/2configs/shack-drivedroid.nix4
3 files changed, 7 insertions, 7 deletions
diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix
index 080a1f33d..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="${shell.escape cfg.workDir}";
- secretsdir="${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 0375e8023..248b46132 100644
--- a/krebs/3modules/buildbot/slave.nix
+++ b/krebs/3modules/buildbot/slave.nix
@@ -149,9 +149,9 @@ let
} // cfg.extraEnviron;
serviceConfig = let
- workdir = "${shell.escape cfg.workDir}";
- contact = "${shell.escape cfg.contact}";
- description = "${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 {
diff --git a/shared/2configs/shack-drivedroid.nix b/shared/2configs/shack-drivedroid.nix
index 2e9d2c002..6133ccc99 100644
--- a/shared/2configs/shack-drivedroid.nix
+++ b/shared/2configs/shack-drivedroid.nix
@@ -1,8 +1,8 @@
{ pkgs, lib, config, ... }:
-
+with config.krebs.lib;
let
repodir = "/var/srv/drivedroid";
- srepodir = config.krebs.lib.shell.escape repodir;
+ srepodir = shell.escape repodir;
in
{
environment.systemPackages = [ pkgs.drivedroid-gen-repo ];